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


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

Please check the signature of this patch file:

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

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

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

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



Prereq: 1.0.4

diff -urN gnupg-1.0.4/VERSION gnupg-1.0.5/VERSION
--- gnupg-1.0.4/VERSION	Tue Oct 17 15:11:23 2000
+++ gnupg-1.0.5/VERSION	Sun Apr 29 16:13:11 2001
@@ -1 +1 @@
-1.0.4
+1.0.5

diff -urN gnupg-1.0.4/AUTHORS gnupg-1.0.5/AUTHORS
--- gnupg-1.0.4/AUTHORS	Wed Oct  4 16:15:49 2000
+++ gnupg-1.0.5/AUTHORS	Tue Apr 17 10:26:50 2001
@@ -30,10 +30,15 @@
 Niklas Hernaeus <nh@df.lth.se> Disclaimer
     (weak key patches)
 
+Nilgun Belma Buguner <nilgun@technologist.com> Translations [tr]
+
 Nils Ellmenreich  <nils 'at' infosun.fmi.uni-passau.de> Assignment
     (configure.in, cipher/rndlinux.c, FAQ)
 
-Pedro Morais <morais@poli.org> Translations [pt_BR]
+Paul Eggert <eggert@twinsun.com> 
+    (configuration macros for LFS)
+
+Pedro Morais <morais@poli.org> Translations [pt_PT]
 
 Rémi Guyomarch	<rguyom@mail.dotcom.fr> Assignment
     (g10/compress.c, g10/encr-data.c,
@@ -43,14 +48,16 @@
 
 Thiago Jung Bauermann <jungmann@cwb.matrix.com.br> Translations [pt_BR]
 
+Toomas Soome <tsoome@ut.ee> Translations [et]
+
 Urko Lusa <ulusa@euskalnet.net> Translations [es_ES]
 
-Walter Koch <koch@hsp.de>  Translations [de]
+Walter Koch <koch@u32.de>  Translations [de]
 
 Werner Koch  <wk@gnupg.org>  Assignment
     (started the whole thing)
 
-Yosiaki IIDA <iida@secom.ne.jp> Translations [ja]
+Yosiaki IIDA <iida@ring.gr.jp> Translations [ja]
 
 
 
@@ -76,3 +83,14 @@
 
 The RPM specs file scripts/gnupg.spec has been contributed by
 several people.
+
+ Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
diff -urN gnupg-1.0.4/BUGS gnupg-1.0.5/BUGS
--- gnupg-1.0.4/BUGS	Wed Jul 12 13:30:52 2000
+++ gnupg-1.0.5/BUGS	Fri Apr 13 21:03:54 2001
@@ -2,7 +2,7 @@
 
     http://www.gnupg.org/buglist.html
 
-for a list know bugs in GnuPG.	We don't distribute this list anymore
+for a list of know bugs in GnuPG.  We don't distribute this list anymore
 with the package because a more current one with notes in which version
 the bug is fixed can be found online.
 
diff -urN gnupg-1.0.4/ChangeLog gnupg-1.0.5/ChangeLog
--- gnupg-1.0.4/ChangeLog	Tue Oct 17 14:55:59 2000
+++ gnupg-1.0.5/ChangeLog	Sat Apr 28 19:56:07 2001
@@ -1,3 +1,70 @@
+2001-04-28  Werner Koch  <wk@gnupg.org>
+
+	Updated all copyright notices.
+
+2001-04-27  Werner Koch  <wk@gnupg.org>
+
+	* README: Removed a few outdated paragraphs.
+
+2001-04-17  Werner Koch  <wk@gnupg.org>
+
+	* acinclude.m4 (GNUPG_CHECK_DOCBOOK_TO_TEXI): New.
+	(GNUPG_CHECK_TYPEDEF): Define _GNU_SOURCE because we will use it
+	anyway.
+
+	* configure.in: Use it here.
+	
+	* configure.in (ALL_LINGUAS): Add Estonian translation by Toomas Soome.
+	(use_m_debug): Removed --enable-m-debug because it does not work
+	anymore.
+
+2001-04-06  Werner Koch  <wk@gnupg.org>
+
+	* configure.in (ALL_LINGUAS): Add Turkish translation.  Thanks
+	to Nilgun Belma Buguner.
+
+2001-03-18  Werner Koch  <wk@gnupg.org>
+
+	* configure.in: Hardwire the use of -lsocket for some
+	systems. Thanks to Reinhard Wobst.
+
+2001-03-13  Werner Koch  <wk@gnupg.org>
+
+	* configure.in: Add copyright notice and -lwsock32.
+
+2001-03-12  Werner Koch  <wk@gnupg.org>
+
+	* INSTALL: Add a note to VPATH builds. 
+
+2001-03-08  Werner Koch  <wk@gnupg.org>
+
+	* debian/: Applied update from James.
+
+	Added copyright and license notices to some more files.
+
+2001-01-18  Werner Koch  <wk@gnupg.org>
+
+	* configure.in: Removed tool definitions for MingW32
+
+2000-11-17  Werner Koch  <wk@gnupg.org>
+
+	* acinclude.m4 (GNUPG_CHECK_FAQPROG): Do not prinnt the warning.
+
+2000-11-11  Paul Eggert  <eggert@twinsun.com>
+
+        Actually Paul's patches are dated 2000-20-17; I applied them today
+	and merged some ChangeLog entries (wk@gnupg.org).
+	
+        * configure.in (AC_SYS_LARGEFILE): Add.
+        (try_large_file): Remove.  All uses removed.
+        (AC_CHECK_FUNCS): Remove fopen64 and fstat64.
+
+        * acinclude.m4 (AC_SYS_LARGEFILE_TEST_INCLUDES,
+        AC_SYS_LARGEFILE_MACRO_VALUE, AC_SYS_LARGEFILE): New macros,
+        taken from GNU tar.
+
+        * configure.in (AC_CHECK_FUNCS): Add fseeko.
+
 2000-10-17  Werner Koch  <wk@gnupg.org>
 
 	* configure.in: Disabled fopen64 checks for Solaris and HPUX.
@@ -559,4 +626,16 @@
 
 	* configure.in : Fixed zlib stuff
 	* Makefile.am: Likewise
+
+
+ Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
 
diff -urN gnupg-1.0.4/INSTALL gnupg-1.0.5/INSTALL
--- gnupg-1.0.4/INSTALL	Fri Aug 25 16:04:02 2000
+++ gnupg-1.0.5/INSTALL	Sat Apr 28 20:51:06 2001
@@ -1,3 +1,14 @@
+Installation instructions for GnuPG
+====================================
+  Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+  This file is free software; as a special exception the author gives
+  unlimited permission to copy and/or distribute it, with or without
+  modifications, as long as this notice is preserved.
+
+  This file is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 Please read the Basic Installation section somewhere below.
 
@@ -35,7 +46,10 @@
 
 --disable-nls	    Disable NLS support (See the file ABOUT-NLS)
 
---enable-m-guard    Enable the integrated malloc checking code.
+--enable-m-guard    Enable the integrated malloc checking code. Please
+                    note that this feature does not work on all CPUs
+                    (e.g. SunOS 5.7 on UltraSparc-2) and might give
+                    you a Bus error.
 
 --disable-dynload   If you have problems with dynamic loading, this option
 		    disables all dynamic loading stuff.
@@ -139,6 +153,10 @@
 The ~/.gnupg directory will be created if it does not exist.  Your first
 action should be to create a key pair: "gpg --gen-key".
 
+Due to limitations in the automake system, the Info format versions of
+the man pages are not installed.  You have to convert the Texinfo
+files by hand (use makeinfo) and copy them to the appropriate place.
+
 
 
 Creating a RPM package
@@ -228,13 +246,14 @@
 Compiling For Multiple Architectures
 ====================================
 
-   You can compile the package for more than one kind of computer at the same
-time by placing the object files for each architecture in their own
-directory.  To do this, you must use a version of `make', such as GNU `make',
-that supports the `VPATH' variable.  `cd' to the directory where you want the
-object files and executables to go and run the `configure' script.
-`configure' automatically checks for the source code in the directory that
-`configure' is in and in `..'.
+   You can compile the package for more than one kind of computer at
+the same time by placing the object files for each architecture in
+their own directory.  To do this, you must use a version of `make',
+such as GNU `make', that supports the `VPATH' variable.  `cd' to the
+directory where you want the object files and executables to go and
+run the `configure' script; please use a relative filename name to
+invoke `configure'.  `configure' automatically checks for the source
+code in the directory that `configure' is in and in `..'.
 
    If you have to use a `make' that does not supports the `VPATH'
 variable, you have to compile the package for one architecture at a time
diff -urN gnupg-1.0.4/Makefile.am gnupg-1.0.5/Makefile.am
--- gnupg-1.0.4/Makefile.am	Wed Apr 19 10:36:35 2000
+++ gnupg-1.0.5/Makefile.am	Thu Mar  8 14:44:41 2001
@@ -1,3 +1,21 @@
+# Copyright (C) 1998, 1999, 2000, 2001 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
+
 ## Process this file with automake to produce Makefile.in
 
 if CROSS_COMPILING
diff -urN gnupg-1.0.4/Makefile.in gnupg-1.0.5/Makefile.in
--- gnupg-1.0.4/Makefile.in	Tue Oct 17 15:39:59 2000
+++ gnupg-1.0.5/Makefile.in	Sun Apr 29 16:38:50 2001
@@ -10,6 +10,24 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+# Copyright (C) 1998, 1999, 2000, 2001 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
+
 
 SHELL = @SHELL@
 
@@ -72,6 +90,7 @@
 DATADIRNAME = @DATADIRNAME@
 DLLTOOL = @DLLTOOL@
 DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
+DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@
 DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@
 DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@
 DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@
diff -urN gnupg-1.0.4/NEWS gnupg-1.0.5/NEWS
--- gnupg-1.0.4/NEWS	Tue Oct 17 14:47:04 2000
+++ gnupg-1.0.5/NEWS	Sun Apr 29 16:19:29 2001
@@ -1,3 +1,61 @@
+Noteworthy changes in version 1.0.5 (2001-04-29)
+------------------------------------------------
+
+    * WARNING: The semantics of --verify have changed to address a
+      problem with detached signature detection. --verify now ignores
+      signed material given on stdin unless this is requested by using
+      a "-" as the name for the file with the signed material.  Please
+      check all your detached signature handling applications and make
+      sure that they don't pipe the signed material to stdin without
+      using a filename together with "-" on the the command line.
+
+    * WARNING: Corrected hash calculation for input data larger than
+      512M - it was just wrong, so you might notice bad signature in
+      some very big files.  It may be wise to keep an old copy of
+      GnuPG around.
+
+    * Secret keys are no longer imported unless you use the new option
+      --allow-secret-key-import.  This is a kludge and future versions will
+      handle it in another way.
+
+    * New command "showpref" in the --edit-key menu to show an easier
+      to understand preference listing.
+
+    * There is now the notation of a primary user ID.  For example, it
+      is printed with a signature verification as the first user ID;
+      revoked user IDs are not printed there anymore.  In general the
+      primary user ID is the one with the latest self-signature.
+
+    * New --charset=utf-8 to bypass all internal conversions.
+
+    * Large File Support (LFS) is now working.
+
+    * New options: --ignore-crc-error, --no-sig-create-check, 
+      --no-sig-cache, --fixed_list_mode, --no-expensive-trust-checks,
+      --enable-special-filenames and --use-agent.  See man page.
+
+    * New command --pipemode, which can be used to run gpg as a
+      co-process.  Currently only the verification of detached
+      signatures are working.  See doc/DETAILS.
+
+    * Keyserver support for the W32 version.
+
+    * Rewritten key selection code so that GnuPG can better cope with
+      multiple subkeys, expire dates and so.  The drawback is that it
+      is slower.
+
+    * A whole lot of bug fixes.
+
+    * The verification status of self-signatures are now cached. To
+      increase the speed of key list operations for existing keys you
+      can do the following in your GnuPG homedir (~/.gnupg):
+         $ cp pubring.gpg pubring.gpg.save && $ gpg --export-all >x && \
+          rm pubring.gpg && gpg --import x
+      Only v4 keys (i.e not the old RSA keys) benefit from this caching.
+
+    * New translations: Estonian, Turkish.
+
+
 Noteworthy changes in version 1.0.4 (2000-10-17)
 ------------------------------------------------
 
@@ -97,7 +155,7 @@
       entirely.  This option should not yet be used.
 
     * New option --no-auto-key-retrieve to disable retrieving of
-      a missing public key from a keyerver, when a keyerver has been set.
+      a missing public key from a keyserver, when a keyserver has been set.
 
     * Danish translation
 
@@ -929,3 +987,13 @@
     * The string "(INSECURE!)" is appended to a new user-id if this
       is generated on a system without a good random number generator.
 
+
+Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+This file is free software; as a special exception the author gives
+unlimited permission to copy and/or distribute it, with or without
+modifications, as long as this notice is preserved.
+
+This file is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff -urN gnupg-1.0.4/PROJECTS gnupg-1.0.5/PROJECTS
--- gnupg-1.0.4/PROJECTS	Mon Aug  7 10:48:01 2000
+++ gnupg-1.0.5/PROJECTS	Thu Mar  8 14:41:28 2001
@@ -29,3 +29,12 @@
       We should add an abstraction layer so that adding support for
       different certificate structures will become easier.
 
+ Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff -urN gnupg-1.0.4/README gnupg-1.0.5/README
--- gnupg-1.0.4/README	Wed Oct  4 16:04:11 2000
+++ gnupg-1.0.5/README	Fri Apr 27 18:18:52 2001
@@ -3,6 +3,19 @@
 		   -------------------------------
 			    Version 1.0
 
+    Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+    This file is free software; as a special exception the author gives
+    unlimited permission to copy and/or distribute it, with or without
+    modifications, as long as this notice is preserved.
+
+    This file is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+    implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+    Intro
+    -----
+
     GnuPG is GNU's tool for secure communication and data storage.
     It can be used to encrypt data and to create digital signatures.
     It includes an advanced key management facility and is compliant
@@ -23,9 +36,7 @@
     is still available, but because of the larger size of such
     signatures it is deprecated (Please note that the GnuPG
     implementation of ElGamal signatures is *not* insecure).  Symmetric
-    algorithms are: 3DES, Blowfish, CAST5 and Twofish (GnuPG does not
-    yet create Twofish encrypted messages because there is no agreement
-    in the OpenPGP WG on how to use it together with a MDC algorithm)
+    algorithms are: AES, 3DES, Blowfish, CAST5 and Twofish 
     Digest algorithms available are MD5, RIPEMD160 and SHA1.
 
 
@@ -87,41 +98,19 @@
 
 		$ gpg --fingerprint 0x57548DCD
 
-       with the elsewhere published fingerprint, or - if you are able to
-       _positively_ verify the signature of this README file - with
-       this fingerprint: "6BD9 050F D8FC 941B 4341  2DCC 68B7 AB89 5754 8DCD"
+       with the elsewhere published fingerprint
 
        Please note, that you have to use an old version of GnuPG to
        do all this stuff.  *Never* use the version which you are going
        to check!
 
 
-    b) If you have a trusted Version of PGP 2 or 5 installed, you
-       can check the supplied PGP 2 signature:
-
-	$ pgp gnupg-x.y.z.tar.gz.sig gnupg-x.y.z.tar.gz
-
-       This checks that the detached signature gnupg-x.y.z.tar.gz.sig
-       is indeed a a signature of gnupg-x.y.z.tar.gz.  Please note,
-       that this signature has been created with a RSA signature and
-       you probably can't use this method (due to legal reasons) when
-       you are in the U.S.  The key used to create this signature is
-       the same as the one used to sign this README file.  It should be
-       available at the keyservers and is also included in the source
-       of GnuPG in g10/pubring.asc.
-
-       "pub   768R/0C9857A5 1995-09-30 Werner Koch <werner.koch@guug.de>"
-
-       The fingerprint of this key is published in printed form in the
-	  "Global Trust Register for 1998", ISBN 0-9532397-0-5.
-
-
-    c) If you don't have any of the above programs, you have to verify
+    b) If you don't have any of the above programs, you have to verify
        the MD5 checksum:
 
 	$ md5sum gnupg-x.y.z.tar.gz
 
-       This should yield an output similar_to this:
+       This should yield an output _similar_ to this:
 
 	fd9351b26b3189c1d577f0970f9dcadc  gnupg-x.y.z.tar.gz
 
@@ -133,7 +122,7 @@
     Documentation
     -------------
 
-    The manual will be distributed separate under the name "gnupgdoc".
+    The manual will be distributed separate under the name "gph".
     An online version of the latest manual draft is available at the
     GnuPG web pages:
 
@@ -475,7 +464,7 @@
     ---------------------------
 
     The primary WWW page is "http://www.gnupg.org"
-    The primary FTP site is "ftp://ftp.gnupg.org/pub/gcrypt/"
+    The primary FTP site is "ftp://ftp.gnupg.org/gcrypt/"
 
     See http://www.gnupg.org/mirrors.html for a list of mirrors
     and use them if possible.  You may also find GnuPG mirrored on
diff -urN gnupg-1.0.4/THANKS gnupg-1.0.5/THANKS
--- gnupg-1.0.4/THANKS	Mon Oct 16 16:11:19 2000
+++ gnupg-1.0.5/THANKS	Sun Apr 29 16:17:39 2001
@@ -23,30 +23,38 @@
 Christian von Roques	   roques@pond.sub.org
 Christopher Oliver	   oliver@fritz.traverse.net
 Christian Recktenwald	   chris@citecs.de
+Dan Winship                danw@helixcode.com
 Daniel Eisenbud 	   eisenbud@cs.swarthmore.edu
 Daniel Koening		   dan@mail.isis.de
 Daniel Resare		   daniel@resare.com
 Dave Dykstra		   dwd@bell-labs.com
+David C Niemi              niemi@tuxers.net
 David Champion             dgc@uchicago.edu
 David Ellement		   ellement@sdd.hp.com
 David Hallinan		   hallinan@rtd.com
+David Hollenberg           dhollen@ISI.EDU
 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
 Edmund GRIMLEY EVANS	   edmundo@rano.org
+Edwin Woudt                edwin@woudt.nl
 Enzo Michelangeli	   em@MailAndNews.com
 Ernst Molitor		   ernst.molitor@uni-bonn.de
 Fabio Coatti		   cova@ferrara.linux.it
 Felix von Leitner	   leitner@amdiv.de
+Florian Weimer             Florian.Weimer@rus.uni-stuttgart.de
 Frank Donahoe		   fdonahoe@wilkes1.wilkes.edu
 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
+Gene Carter                gcarter@lanier.com
+Georg Schwarz              georg.schwarz@iname.com
 Giampaolo Tomassoni        g.tomassoni@libero.it
+Gilbert Fernandes          gilbert_fernandes@hotmail.com
 Greg Louis		   glouis@dynamicro.on.ca
 Greg Troxel		   gdt@ir.bbn.com
 Gregory Steuck		   steuck@iname.com
@@ -61,6 +69,7 @@
 Ian McKellar		   imckellar@harvestroad.com.au
 Ivo Timmermans		   itimmermans@bigfoot.com
 Jan Krueger		   max@physics.otago.ac.nz
+Jan Niehusmann             jan@gondor.com  
 Janusz A. Urbanowicz	   alex@bofh.torun.pl
 James Troup		   james@nocrew.org
 Jean-loup Gailly	   gzip@prep.ai.mit.edu
@@ -70,19 +79,27 @@
 Jeroen C. van Gelderen     jeroen@vangelderen.org
 J Horacio MG		   homega@ciberia.es
 J. Michael Ashley          jashley@acm.org
+Jim Bauer                  jfbauer@home.com
 Jim Small                  cavenewt@my-deja.com
 Joachim Backes		   backes@rhrk.uni-kl.de
+Joe Rhett                  jrhett@isite.net
 John A. Martin		   jam@jamux.com
 Johnny Teveßen		   j.tevessen@gmx.de
 Jörg Schilling		   schilling@fokus.gmd.de
 Jos Backus		   Jos.Backus@nl.origin-it.com
 Jun Kuriyama		   kuriyama@sky.rim.or.jp
+Kahil D. Jallad            kdj4@cs.columbia.edu
 Karl Fogel		   kfogel@guanabana.onshore.com
 Karsten Thygesen	   karthy@kom.auc.dk
 Katsuhiro Kondou	   kondou@nec.co.jp
 Kazu Yamamoto		   kazu@iijlab.net
+Keith Clayton              keith@claytons.org
+Kevin Ryde                 user42@zip.com.au
+Klaus Singvogel            ks@caldera.de
 Lars Kellogg-Stedman	   lars@bu.edu
 L. Sassaman		   rabbi@quickie.net
+M Taylor                   mctaylor@privacy.nb.ca                 
+Marcel Waldvogel           mwa@arl.wustl.edu
 Marco d'Itri               md@linux.it
 Mark Adler		   madler@alumni.caltech.edu
 Mark Elbrecht		   snowball3@bigfoot.com
@@ -107,9 +124,12 @@
 Oliver Haakert		   haakert@hsp.de
 Oskari Jääskeläinen	   f33003a@cc.hut.fi
 Paul D. Smith		   psmith@baynetworks.com
+Per Cederqvist             ceder@lysator.liu.se
 Philippe Laliberte	   arsphl@oeil.qc.ca
+Peter Fales                psfales@lucent.com
 Peter Gutmann		   pgut001@cs.auckland.ac.nz
 Peter Marschall 	   Peter.Marschall@gedos.de
+Piotr Krukowiecki          piotr@pingu.ii.uj.edu.pl
 QingLong		   qinglong@bolizm.ihep.su
 Ralph Gillen		   gillen@theochem.uni-duesseldorf.de
 Rat			   ratinox@peorth.gweep.net
@@ -118,44 +138,62 @@
 Reuben Sumner		   rasumner@wisdom.weizmann.ac.il
 Richard Outerbridge	   outer@interlog.com
 Roddy Strachan		   roddy@satlink.com.au
+Roger Sondermann           r.so@bigfoot.com
 Roland Rosenfeld	   roland@spinnaker.rhein.de
 Ross Golder		   rossigee@bigfoot.com
 Sam Roberts		   sam@cogent.ca
 Sean MacLennan		   seanm@netwinder.org
 Serge Munhoven		   munhoven@mema.ucl.ac.be
 SL Baur 		   steve@xemacs.org
+Stefan Bellon              sbellon@sbellon.de
 Stefan Karrmann 	   S.Karrmann@gmx.net
 Stefan Keller		   dres@cs.tu-berlin.de
 Steffen Ullrich 	   ccrlphr@xensei.com
 Steffen Zahn		   zahn@berlin.snafu.de
 Steven Bakker		   steven@icoe.att.com
+Steven Murdoch             sjmurdoch@bigfoot.com
 Susanne Schultz 	   schultz@hsp.de
 Ted Cabeen		   secabeen@pobox.com
 Thiago Jung Bauermann	   jungmann@cwb.matrix.com.br
 Thomas Roessler 	   roessler@guug.de
 Tim Mooney		   mooney@dogbert.cc.ndsu.nodak.edu
+Timo Schulz                towaday@freakmail.de
 Tom Spindler		   dogcow@home.merit.edu
 Tom Zerucha		   tzeruch@ceddec.com
 Tomas Fasth		   tomas.fasth@twinspot.net
+Tommi Komulainen           Tommi.Komulainen@iki.fi
 Thomas Klausner 	   wiz@danbala.ifoer.tuwien.ac.at
+Tomasz Kozlowski           tomek@rentec.com
 Thomas Mikkelsen	   tbm@image.dk
 Ulf Möller		   3umoelle@informatik.uni-hamburg.de
 Urko Lusa		   ulusa@euskalnet.net
+Vincent P. Broman          broman@spawar.navy.mil
 Walter Hofmann		   Walter.Hofmann@physik.stud.uni-erlangen.de
 Walter Koch		   koch@hsp.de
 Wayne Chapeskie 	   waynec@spinnaker.com
 Werner Koch		   wk@gnupg.org
 Wim Vandeputte		   bunbun@reptile.rug.ac.be
-Yosiaki IIDA		   iida@secom.ne.jp
+Yosiaki IIDA		   iida@ring.gr.jp
 Yoshihiro Kajiki	   kajiki@ylug.org
+                           disastry@saiknes.lv
 			   nbecker@hns.com
 
-Thanks to the German Unix User Group for providing FTP space,
-Martin Hamilton for hosting the mailing list and HSP for
-hosting gnupg.org.
+Thanks to the German Unix User Group for sponsoring this project,
+Martin Hamilton for hosting the first mailing list and OpenIT for
+cheap hosting conditions.
 
 The development of this software has partly been funded by the German
 Ministry for Economics and Technology under grant VIB3-68553.168-001/1999.
 
 Many thanks to my wife Gerlinde for having so much patience with
 me while hacking late in the evening.
+
+ Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff -urN gnupg-1.0.4/TODO gnupg-1.0.5/TODO
--- gnupg-1.0.4/TODO	Tue Oct 17 14:44:47 2000
+++ gnupg-1.0.5/TODO	Wed Apr 25 12:01:08 2001
@@ -1,4 +1,14 @@
 
+  * Check that no secret temporary results are stored in the result parameter
+    of the mpi functions.  We have already done this for mpi-mul.c 
+
+  * check whether we can remove all the expire stuff in trustdb because this
+    is now done in getkey.  
+
+  * We need another special packet at the end of a clearsign message to mark
+    it's end and allow for multiple signature for one message.  And
+    add a real grammar to the code in mainproc.c
+
   * option to set the signature expiration time for key sigs.
 
   * Option to warn when a non MDC message is decrypted?
@@ -6,70 +16,64 @@
   * If there is no secure memory, allocate more memory for the secure
     memory block or do it in all cases.
 
-  * for detached signatures:  Allow to specify a filedescriptor (maybe
-    we can use a generic way to specify filedescriptors - "-" is already
-    used to specify 0/1).
-
-  * List all UserID with GOODSIG?
-
   * add a way to set expiration time for key signatures.
 
   * add some minor things vor VMS.
 
   * 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 ]
+    [ currently solved by re-introducing --trusted-key ]  Eventually we
+    will have commands --{add,remove}-trusted-key which keeps them in
+    special trustdb records.
 
-  * Use DSA keys with the test suite.
+  * Use DSA keys with the test suite (partly done)
 
   * g10/trustdb.c (make_sig_records): fix the fixme.
 
-  * at least an option to prefer DSA keys over RSA when selecting the key to
-    use.  Depending on creation time would be nice too.  I think this is
-    already done for the subkeys - check it.
+  * Replace Valid/Invalid by Known/Unknown?
 
-  * Fix localtime() in W32.
+  * Fix the bug in the mips assembler code
 
-  * No TCP support yet for W32? arggg - should go into a separate program
-    anyway.
+  * Add a way to show the fingerprint of an key signator's keys
 
-  * Replace Valid/Invalid by Known/Unknown?
+  * New option --file-remove path-to-wipe-program ?
+
+  * Add an is_valid flag to each user ID.
+
+  * Do not create a secring.gpg if it is not needed; I have fixed this
+    sometime ago but it has later reappeared.
+
+  * Check for consistent spelling of user ID, key ID etc.
+    Replace "user id not found" in getkey.c by "no valid user ID found".
+ 
+  * Do not return "[revoked] User Name" unless in verbose mode, so that
+    revoked user IDs are better hidden. 
+
+  * Replace the printing of the user name by [self-signature] when
+    appropriate so that a key listing does not get clobbered.
 
-  * 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
     to a problem in cases where there are 2 keys with identically user-IDs.
 
-  * Rework the whole key selection stuff: Compile a list of valid
-    candidates for a keyblock first and the select one from it.
-    The current code is too ugly (getkey.c).
-
   * With option -i prompt before adding a key to the keyring and show some
     info what we are about to add.
 
   * Speed up calculation of key validation.
 
-  * print a warning when a revoked/expired _secret_ key is used.
-
   * --disable-asm should still assemble _udiv_qrnnd when needed
 
   * 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.
 
   * Check the beginning of file to detect already compressed files (gzip,
     bzip2, xdelta and some picture formats)
 
-  * 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
+  * Get new assembler stuff from gmp 3.1
 
 
 Nice to have
@@ -84,9 +88,6 @@
     test program.  Use it with the test suite?
   * add test cases for invalid data (scrambled armor or other random data)
   * add checking of armor trailers
-  * Burn the buffers used by fopen(), or use read(2). Does this
-    really make sense?	And while we are at it:  implement a secure deletion
-    stuff?
   * the pubkey encrypt functions should do some sanity checks.
   * dynload: implement the hint stuff.
   * "gpg filename.tar.gz.asc" should work like --verify (-sab).
@@ -94,11 +95,7 @@
     verification status of the message to the output (i.e. write something to
     the --output file and not only to stderr.
   * configure option where to find zlib
-  * Display more validity information about the user IDs at certain places.
-    We need a more general function to extract such kind of info from the
-    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.4/acconfig.h gnupg-1.0.5/acconfig.h
--- gnupg-1.0.4/acconfig.h	Fri Aug 25 13:17:14 2000
+++ gnupg-1.0.5/acconfig.h	Thu Mar  8 14:57:26 2001
@@ -1,5 +1,5 @@
 /* acconfig.h - used by autoheader to make config.h.in
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG.
  *
diff -urN gnupg-1.0.4/acinclude.m4 gnupg-1.0.5/acinclude.m4
--- gnupg-1.0.4/acinclude.m4	Mon Oct  9 13:41:12 2000
+++ gnupg-1.0.5/acinclude.m4	Fri Apr 27 16:42:25 2001
@@ -1,5 +1,21 @@
 dnl macros to configure g10
-
+dnl Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+dnl
+dnl This file is part of GnuPG.
+dnl
+dnl GnuPG is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl 
+dnl GnuPG is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
 dnl GNUPG_MSG_PRINT(STRING)
 dnl print a message
@@ -15,7 +31,8 @@
 AC_DEFUN(GNUPG_CHECK_TYPEDEF,
   [ AC_MSG_CHECKING(for $1 typedef)
     AC_CACHE_VAL(gnupg_cv_typedef_$1,
-    [AC_TRY_COMPILE([#include <stdlib.h>
+    [AC_TRY_COMPILE([#define _GNU_SOURCE 1
+    #include <stdlib.h>
     #include <sys/types.h>], [
     #undef $1
     int a = sizeof($1);
@@ -60,17 +77,33 @@
     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;
-*** however it is only needed if you want to change the FAQ.
-***  (faqprog.pl should be available at:
-***    ftp://ftp.gnupg.org/pub/gcrypt/contrib/faqprog.pl )
-*** No need to worry about this warning.
-***]])
+dnl     if test $working_faqprog = no; then
+dnl         AC_MSG_WARN([[
+dnl ***
+dnl *** It seems that the faqprog.pl program is not installed;
+dnl *** however it is only needed if you want to change the FAQ.
+dnl ***  (faqprog.pl should be available at:
+dnl ***    ftp://ftp.gnupg.org/pub/gcrypt/contrib/faqprog.pl )
+dnl *** No need to worry about this warning.
+dnl ***]])
+dnl     fi
+   ])       
+
+dnl GNUPG_CHECK_DOCBOOK_TO_TEXI
+dnl
+AC_DEFUN(GNUPG_CHECK_DOCBOOK_TO_TEXI,
+  [
+    AC_CHECK_PROG(DOCBOOK_TO_TEXI, docbook2texi, yes, no)
+    AC_MSG_CHECKING(for sgml to texi tools)
+    working_sgmltotexi=no
+    if test "$ac_cv_prog_DOCBOOK_TO_TEXI" = yes; then
+      if sgml2xml -v /dev/null 2>&1 | grep 'SP version' >/dev/null 2>&1 ; then
+            working_sgmltotexi=yes
+      fi
     fi
-  ])       
+    AC_MSG_RESULT($working_sgmltotexi)
+    AM_CONDITIONAL(HAVE_DOCBOOK_TO_TEXI, test "$working_sgmltotexi" = "yes" )
+   ])       
 
 
 dnl GNUPG_LINK_FILES( SRC, DEST )
@@ -429,7 +462,6 @@
 
 
 ################################################################
-
 # GNUPG_PROG_NM - find the path to a BSD-compatible name lister
 AC_DEFUN(GNUPG_PROG_NM,
 [AC_MSG_CHECKING([for BSD-compatible nm])
@@ -720,4 +752,82 @@
 fi
 ])
 
-dnl *-*wedit:notab*-*  Please keep this as the last line.
+ 
+dnl AC_SYS_LARGEFILE is stolen from tar.
+dnl This can be removed once the official successor to autoconf 2.13 is out.
+#serial 12
+
+dnl By default, many hosts won't let programs access large files;
+dnl one must use special compiler options to get large-file access to work.
+dnl For more details about this brain damage please see:
+dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
+
+dnl Written by Paul Eggert <eggert@twinsun.com>.
+
+dnl Internal subroutine of AC_SYS_LARGEFILE.
+dnl AC_SYS_LARGEFILE_TEST_INCLUDES
+AC_DEFUN(AC_SYS_LARGEFILE_TEST_INCLUDES,
+  [[#include <sys/types.h>
+    int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];
+  ]])
+
+dnl Internal subroutine of AC_SYS_LARGEFILE.
+dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR,
+dnl                              COMMENT, INCLUDES,FUNCTION-BODY)
+AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE,
+  [AC_CACHE_CHECK([for $1 value needed for large files], $3,
+     [$3=no
+      AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES
+$5
+        ,
+       [$6],
+       ,
+       [AC_TRY_COMPILE([#define $1 $2]
+AC_SYS_LARGEFILE_TEST_INCLUDES
+$5
+          ,
+          [$6],
+          [$3=$2])])])
+   if test "[$]$3" != no; then
+     AC_DEFINE_UNQUOTED([$1], [$]$3, [$4])
+   fi])
+
+AC_DEFUN(AC_SYS_LARGEFILE,
+  [AC_ARG_ENABLE(largefile,
+     [  --disable-largefile     omit support for large files])
+   if test "$enable_largefile" != no; then
+
+     AC_CACHE_CHECK([for special C compiler options needed for large files],
+       ac_cv_sys_largefile_CC,
+       [ac_cv_sys_largefile_CC=no
+        if test "$GCC" != yes; then
+         # IRIX 6.2 and later do not support large files by default,
+         # so use the C compiler's -n32 option if that helps.
+         AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , ,
+           [ac_save_CC="$CC"
+            CC="$CC -n32"
+            AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, ,
+              ac_cv_sys_largefile_CC=' -n32')
+            CC="$ac_save_CC"])
+        fi])
+     if test "$ac_cv_sys_largefile_CC" != no; then
+       CC="$CC$ac_cv_sys_largefile_CC"
+     fi
+
+     AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64,
+       ac_cv_sys_file_offset_bits,
+       [Number of bits in a file offset, on hosts where this is settable.])
+     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1,
+       ac_cv_sys_largefile_source,
+       [Define to make ftello visible on some hosts (e.g. HP-UX 10.20).],
+       [#include <stdio.h>], [return !ftello;])
+     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1,
+       ac_cv_sys_large_files,
+       [Define for large files, on AIX-style hosts.])
+     AC_SYS_LARGEFILE_MACRO_VALUE(_XOPEN_SOURCE, 500,
+       ac_cv_sys_xopen_source,
+       [Define to make ftello visible on some hosts (e.g. glibc 2.1.3).],
+       [#include <stdio.h>], [return !ftello;])
+   fi
+  ])
+
diff -urN gnupg-1.0.4/aclocal.m4 gnupg-1.0.5/aclocal.m4
--- gnupg-1.0.4/aclocal.m4	Tue Oct 17 15:39:38 2000
+++ gnupg-1.0.5/aclocal.m4	Sat Apr 28 19:55:31 2001
@@ -11,7 +11,23 @@
 dnl PARTICULAR PURPOSE.
 
 dnl macros to configure g10
-
+dnl Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+dnl
+dnl This file is part of GnuPG.
+dnl
+dnl GnuPG is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl 
+dnl GnuPG is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
 dnl GNUPG_MSG_PRINT(STRING)
 dnl print a message
@@ -27,7 +43,8 @@
 AC_DEFUN(GNUPG_CHECK_TYPEDEF,
   [ AC_MSG_CHECKING(for $1 typedef)
     AC_CACHE_VAL(gnupg_cv_typedef_$1,
-    [AC_TRY_COMPILE([#include <stdlib.h>
+    [AC_TRY_COMPILE([#define _GNU_SOURCE 1
+    #include <stdlib.h>
     #include <sys/types.h>], [
     #undef $1
     int a = sizeof($1);
@@ -72,17 +89,33 @@
     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;
-*** however it is only needed if you want to change the FAQ.
-***  (faqprog.pl should be available at:
-***    ftp://ftp.gnupg.org/pub/gcrypt/contrib/faqprog.pl )
-*** No need to worry about this warning.
-***]])
+dnl     if test $working_faqprog = no; then
+dnl         AC_MSG_WARN([[
+dnl ***
+dnl *** It seems that the faqprog.pl program is not installed;
+dnl *** however it is only needed if you want to change the FAQ.
+dnl ***  (faqprog.pl should be available at:
+dnl ***    ftp://ftp.gnupg.org/pub/gcrypt/contrib/faqprog.pl )
+dnl *** No need to worry about this warning.
+dnl ***]])
+dnl     fi
+   ])       
+
+dnl GNUPG_CHECK_DOCBOOK_TO_TEXI
+dnl
+AC_DEFUN(GNUPG_CHECK_DOCBOOK_TO_TEXI,
+  [
+    AC_CHECK_PROG(DOCBOOK_TO_TEXI, docbook2texi, yes, no)
+    AC_MSG_CHECKING(for sgml to texi tools)
+    working_sgmltotexi=no
+    if test "$ac_cv_prog_DOCBOOK_TO_TEXI" = yes; then
+      if sgml2xml -v /dev/null 2>&1 | grep 'SP version' >/dev/null 2>&1 ; then
+            working_sgmltotexi=yes
+      fi
     fi
-  ])       
+    AC_MSG_RESULT($working_sgmltotexi)
+    AM_CONDITIONAL(HAVE_DOCBOOK_TO_TEXI, test "$working_sgmltotexi" = "yes" )
+   ])       
 
 
 dnl GNUPG_LINK_FILES( SRC, DEST )
@@ -432,7 +465,6 @@
   ])
 
 
-
 # GNUPG_PROG_NM - find the path to a BSD-compatible name lister
 AC_DEFUN(GNUPG_PROG_NM,
 [AC_MSG_CHECKING([for BSD-compatible nm])
@@ -723,7 +755,85 @@
 fi
 ])
 
-dnl *-*wedit:notab*-*  Please keep this as the last line.
+ 
+dnl AC_SYS_LARGEFILE is stolen from tar.
+dnl This can be removed once the official successor to autoconf 2.13 is out.
+#serial 12
+
+dnl By default, many hosts won't let programs access large files;
+dnl one must use special compiler options to get large-file access to work.
+dnl For more details about this brain damage please see:
+dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
+
+dnl Written by Paul Eggert <eggert@twinsun.com>.
+
+dnl Internal subroutine of AC_SYS_LARGEFILE.
+dnl AC_SYS_LARGEFILE_TEST_INCLUDES
+AC_DEFUN(AC_SYS_LARGEFILE_TEST_INCLUDES,
+  [[#include <sys/types.h>
+    int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];
+  ]])
+
+dnl Internal subroutine of AC_SYS_LARGEFILE.
+dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR,
+dnl                              COMMENT, INCLUDES,FUNCTION-BODY)
+AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE,
+  [AC_CACHE_CHECK([for $1 value needed for large files], $3,
+     [$3=no
+      AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES
+$5
+        ,
+       [$6],
+       ,
+       [AC_TRY_COMPILE([#define $1 $2]
+AC_SYS_LARGEFILE_TEST_INCLUDES
+$5
+          ,
+          [$6],
+          [$3=$2])])])
+   if test "[$]$3" != no; then
+     AC_DEFINE_UNQUOTED([$1], [$]$3, [$4])
+   fi])
+
+AC_DEFUN(AC_SYS_LARGEFILE,
+  [AC_ARG_ENABLE(largefile,
+     [  --disable-largefile     omit support for large files])
+   if test "$enable_largefile" != no; then
+
+     AC_CACHE_CHECK([for special C compiler options needed for large files],
+       ac_cv_sys_largefile_CC,
+       [ac_cv_sys_largefile_CC=no
+        if test "$GCC" != yes; then
+         # IRIX 6.2 and later do not support large files by default,
+         # so use the C compiler's -n32 option if that helps.
+         AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , ,
+           [ac_save_CC="$CC"
+            CC="$CC -n32"
+            AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, ,
+              ac_cv_sys_largefile_CC=' -n32')
+            CC="$ac_save_CC"])
+        fi])
+     if test "$ac_cv_sys_largefile_CC" != no; then
+       CC="$CC$ac_cv_sys_largefile_CC"
+     fi
+
+     AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64,
+       ac_cv_sys_file_offset_bits,
+       [Number of bits in a file offset, on hosts where this is settable.])
+     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1,
+       ac_cv_sys_largefile_source,
+       [Define to make ftello visible on some hosts (e.g. HP-UX 10.20).],
+       [#include <stdio.h>], [return !ftello;])
+     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1,
+       ac_cv_sys_large_files,
+       [Define for large files, on AIX-style hosts.])
+     AC_SYS_LARGEFILE_MACRO_VALUE(_XOPEN_SOURCE, 500,
+       ac_cv_sys_xopen_source,
+       [Define to make ftello visible on some hosts (e.g. glibc 2.1.3).],
+       [#include <stdio.h>], [return !ftello;])
+   fi
+  ])
+
 
 # Define a conditional.
 
diff -urN gnupg-1.0.4/checks/ChangeLog gnupg-1.0.5/checks/ChangeLog
--- gnupg-1.0.4/checks/ChangeLog	Thu Feb 10 17:41:05 2000
+++ gnupg-1.0.5/checks/ChangeLog	Sat Apr 28 21:40:29 2001
@@ -1,3 +1,36 @@
+2001-04-28  Werner Koch  <wk@gnupg.org>
+
+	* run-gpg.patterns: a v3 test key expired yesterday, suppress the
+	messages.
+
+2001-03-27  Werner Koch  <wk@gnupg.org>
+
+	* defs.inc: Removed creation of options file.
+	* options.in: New.
+	* Makefile.am: Create options file and fixed import of pubdemo.asc.
+
+	* run-gpg.patterns (gpg): Add some more patterns.
+
+2001-03-20  Werner Koch  <wk@gnupg.org>
+
+	* Makefile.am: Import the pubdemo.asc file 
+
+	* sigs.test (hash_algo_list): s/tiger/tiger192/
+
+2001-03-19  Werner Koch  <wk@gnupg.org>
+
+	* mkdemodirs (GPGDEMO): Add --allow-secret-key-import to all gpg
+	invocations.  Use echon -n instead of an argument with \c.
+
+2001-02-12  Werner Koch  <wk@gnupg.org>
+
+	* multisig.test: new
+	* Makefile.am (TESTS): Added.
+
+2000-10-18  Werner Koch  <wk@gnupg.org>
+
+	* conventional-mdc.test: Add Rijndael and fix for empty plain texts.
+
 Thu Feb 10 17:39:44 CET 2000  Werner Koch  <wk@gnupg.de>
 
 	* mkdemodirs: Fixed the --clean loop.
@@ -68,4 +101,16 @@
 	* Makefile.am: Now uses mk-tdata to produce random test data.
 
 	* ChangeLog: New.
+
+
+ Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
 
diff -urN gnupg-1.0.4/checks/Makefile.am gnupg-1.0.5/checks/Makefile.am
--- gnupg-1.0.4/checks/Makefile.am	Sat Jun  3 13:51:10 2000
+++ gnupg-1.0.5/checks/Makefile.am	Tue Mar 27 13:47:51 2001
@@ -1,6 +1,25 @@
+# Copyright (C) 1998, 1999, 2000, 2001 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
+
 ## Process this file with automake to create Makefile.in
 
-GPG_DEARMOR = ../g10/gpg --no-options --quiet --yes --dearmor
+GPG_DEARMOR = ../g10/gpg --no-options --no-greeting --batch --quiet --yes --dearmor
+GPG_IMPORT  = ../g10/gpg --homedir . --quiet --yes --import
 
 TESTS = version.test mds.test \
 	decrypt.test decrypt-dsa.test \
@@ -11,12 +30,13 @@
 	signencrypt.test signencrypt-dsa.test \
 	armsignencrypt.test armdetach.test \
 	armdetachm.test detachm.test genkey1024.test \
-	conventional.test conventional-mdc.test
+	conventional.test conventional-mdc.test \
+	multisig.test
 
 
 TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \
 	     plain-1.asc plain-2.asc plain-3.asc plain-1-pgp.asc \
-	     pubring.pkr.asc secring.skr.asc secdemo.asc pubdemo.asc
+	     pubring.pkr.asc secring.skr.asc secdemo.asc pubdemo.asc options.in
 
 DATA_FILES = data-500 data-9000 data-32000 data-80000 plain-large
 
@@ -24,7 +44,7 @@
 	     mkdemodirs signdemokey
 CLEANFILES = prepared.stamp x y yy z out err  $(DATA_FILES) \
 	     plain-1 plain-2 plain-3 options trustdb.gpg *.lock .\#lk* \
-	     pubring.gpg secring.gpg pubring.pkr secring.skr
+	     pubring.gpg secring.gpg pubring.pkr secring.skr options
 DISTCLEANFILES = pubring.gpg~
 
 
@@ -34,11 +54,14 @@
 	./mkdemodirs --clean
 
 prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \
-		./pubring.pkr ./secring.skr $(DATA_FILES)
+		./pubring.pkr ./secring.skr ./options $(DATA_FILES)
+	 $(GPG_IMPORT) $(srcdir)/pubdemo.asc	 
 	 echo timestamp >./prepared.stamp
 
+./options: $(srcdir)/options.in
+	cat $(srcdir)/options.in >./options
 
-./pubring.gpg: $(srcdir)/pubring.asc
+./pubring.gpg: $(srcdir)/pubring.asc $(srcdir)/pubdemo.asc
 	 $(GPG_DEARMOR) -o ./pubring.gpg $(srcdir)/pubring.asc
 
 ./secring.gpg: $(srcdir)/secring.asc
diff -urN gnupg-1.0.4/checks/Makefile.in gnupg-1.0.5/checks/Makefile.in
--- gnupg-1.0.4/checks/Makefile.in	Tue Oct 17 15:40:52 2000
+++ gnupg-1.0.5/checks/Makefile.in	Sun Apr 29 16:39:46 2001
@@ -10,6 +10,24 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+# Copyright (C) 1998, 1999, 2000, 2001 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
+
 
 SHELL = @SHELL@
 
@@ -72,6 +90,7 @@
 DATADIRNAME = @DATADIRNAME@
 DLLTOOL = @DLLTOOL@
 DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
+DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@
 DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@
 DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@
 DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@
@@ -106,19 +125,20 @@
 ZLIBS = @ZLIBS@
 l = @l@
 
-GPG_DEARMOR = ../g10/gpg --no-options --quiet --yes --dearmor
+GPG_DEARMOR = ../g10/gpg --no-options --no-greeting --batch --quiet --yes --dearmor
+GPG_IMPORT = ../g10/gpg --homedir . --quiet --yes --import
 
-TESTS = version.test mds.test 	decrypt.test decrypt-dsa.test 	sigs.test sigs-dsa.test 	encrypt.test encrypt-dsa.test  	seat.test clearsig.test encryptp.test detach.test 	armsigs.test armencrypt.test armencryptp.test 	signencrypt.test signencrypt-dsa.test 	armsignencrypt.test armdetach.test 	armdetachm.test detachm.test genkey1024.test 	conventional.test conventional-mdc.test
+TESTS = version.test mds.test 	decrypt.test decrypt-dsa.test 	sigs.test sigs-dsa.test 	encrypt.test encrypt-dsa.test  	seat.test clearsig.test encryptp.test detach.test 	armsigs.test armencrypt.test armencryptp.test 	signencrypt.test signencrypt-dsa.test 	armsignencrypt.test armdetach.test 	armdetachm.test detachm.test genkey1024.test 	conventional.test conventional-mdc.test 	multisig.test
 
 
-TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc 	     plain-1.asc plain-2.asc plain-3.asc plain-1-pgp.asc 	     pubring.pkr.asc secring.skr.asc secdemo.asc pubdemo.asc
+TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc 	     plain-1.asc plain-2.asc plain-3.asc plain-1-pgp.asc 	     pubring.pkr.asc secring.skr.asc secdemo.asc pubdemo.asc options.in
 
 
 DATA_FILES = data-500 data-9000 data-32000 data-80000 plain-large
 
 EXTRA_DIST = defs.inc run-gpg run-gpg.patterns $(TESTS) $(TEST_FILES) 	     mkdemodirs signdemokey
 
-CLEANFILES = prepared.stamp x y yy z out err  $(DATA_FILES) 	     plain-1 plain-2 plain-3 options trustdb.gpg *.lock .\#lk* 	     pubring.gpg secring.gpg pubring.pkr secring.skr
+CLEANFILES = prepared.stamp x y yy z out err  $(DATA_FILES) 	     plain-1 plain-2 plain-3 options trustdb.gpg *.lock .\#lk* 	     pubring.gpg secring.gpg pubring.pkr secring.skr options
 
 DISTCLEANFILES = pubring.gpg~
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
@@ -254,10 +274,14 @@
 	./mkdemodirs --clean
 
 prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \
-		./pubring.pkr ./secring.skr $(DATA_FILES)
+		./pubring.pkr ./secring.skr ./options $(DATA_FILES)
+	 $(GPG_IMPORT) $(srcdir)/pubdemo.asc	 
 	 echo timestamp >./prepared.stamp
 
-./pubring.gpg: $(srcdir)/pubring.asc
+./options: $(srcdir)/options.in
+	cat $(srcdir)/options.in >./options
+
+./pubring.gpg: $(srcdir)/pubring.asc $(srcdir)/pubdemo.asc
 	 $(GPG_DEARMOR) -o ./pubring.gpg $(srcdir)/pubring.asc
 
 ./secring.gpg: $(srcdir)/secring.asc
diff -urN gnupg-1.0.4/checks/conventional-mdc.test gnupg-1.0.5/checks/conventional-mdc.test
--- gnupg-1.0.4/checks/conventional-mdc.test	Sat Jun  3 14:11:13 2000
+++ gnupg-1.0.5/checks/conventional-mdc.test	Wed Oct 18 17:13:45 2000
@@ -4,8 +4,13 @@
 
 #info Checking conventional encryption
 for i in 0 1 2 3 9 10 11 19 20 21 22 23 39 40 41 8192 32000 ; do
-  for ciph in 3des cast5 blowfish twofish; do
-    dd if=data-80000 of=z bs=1 count=$i 2>/dev/null
+  for ciph in 3des cast5 blowfish twofish rijndael; do
+    # *BSD's dd can't cope with a count of 0
+    if test "$i" = "0"; then
+        : >z
+    else
+        dd if=data-80000 of=z bs=1 count=$i 2>/dev/null
+    fi
     echo "Hier spricht HAL" | $srcdir/run-gpg --passphrase-fd 0 \
 	--force-mdc --cipher $ciph -c -o x --yes z
     echo "Hier spricht HAL" | $srcdir/run-gpg --passphrase-fd 0 \
diff -urN gnupg-1.0.4/checks/defs.inc gnupg-1.0.5/checks/defs.inc
--- gnupg-1.0.4/checks/defs.inc	Wed Jul 12 14:56:22 2000
+++ gnupg-1.0.5/checks/defs.inc	Tue Mar 27 13:46:38 2001
@@ -98,11 +98,5 @@
 
 [ -z "$srcdir" ] && fatal "not called from make"
 
-cat <<EOF  >./options
-no-greeting
-no-secmem-warning
-load-extension ../cipher/tiger
-batch
-emulate-md-encode-bug
-EOF
-
+:
+# end
\ No newline at end of file
diff -urN gnupg-1.0.4/checks/encryptp.test gnupg-1.0.5/checks/encryptp.test
--- gnupg-1.0.4/checks/encryptp.test	Mon Sep 14 17:49:48 1998
+++ gnupg-1.0.5/checks/encryptp.test	Tue Dec 19 12:45:26 2000
@@ -4,7 +4,7 @@
 
 #info Checking encryption with a pipe
 for i in $plain_files $data_files ; do
-    $srcdir/run-gpg -e --yes -r "$usrname2" <$i | tee yy | $srcdir/run-gpg --yes > y
+    $srcdir/run-gpg -e --yes -r "$usrname2" <$i | $srcdir/run-gpg --yes > y
     cmp $i y || error "$i: mismatch"
 done
 
diff -urN gnupg-1.0.4/checks/genkey1024.test gnupg-1.0.5/checks/genkey1024.test
--- gnupg-1.0.4/checks/genkey1024.test	Fri Apr  9 12:34:34 1999
+++ gnupg-1.0.5/checks/genkey1024.test	Tue Mar 27 12:35:09 2001
@@ -13,7 +13,7 @@
 LANG=
 LANGUAGE=
 
-expect  - <<EOF >/dev/null
+expect - <<EOF >/dev/null
 #set timeout -1
 set timeout 8
 match_max 100000
diff -urN gnupg-1.0.4/checks/mkdemodirs gnupg-1.0.5/checks/mkdemodirs
--- gnupg-1.0.4/checks/mkdemodirs	Thu Feb 10 17:41:05 2000
+++ gnupg-1.0.5/checks/mkdemodirs	Mon Mar 19 19:55:02 2001
@@ -2,7 +2,7 @@
 
 set -e
 
-GPG="../g10/gpg --batch --quiet --no-secmem-warning"
+GPG="../g10/gpg --batch --quiet --no-secmem-warning --allow-secret-key-import"
 NAMES='Alpha Bravo Charlie Delta Echo Foxtrot Golf Hotel India
        Juliet Kilo Lima Mike November Oscar Papa Quebec Romeo
        Sierra Tango Uniform Victor Whisky XRay Yankee Zulu'
@@ -19,9 +19,9 @@
 [ -f ./tdb.tmp ] && rm ./tdb.tmp
 GPGDEMO="$GPG --homedir . --trustdb-name ./tdb.tmp --no-default-keyring
 	 --keyring pubdemo.gpg --secret-keyring secdemo.gpg"
-/bin/echo "Creating:\c"
+echo -n "Creating:"
 for name in $NAMES; do
-    /bin/echo " $name\c"
+    echo -n " $name"
     [ -d $name ] && rm -r $name
     mkdir $name
     $GPGDEMO --export-secret-key -o - $name > $name/Secret.gpg
diff -urN gnupg-1.0.4/checks/multisig.test gnupg-1.0.5/checks/multisig.test
--- gnupg-1.0.4/checks/multisig.test	Thu Jan  1 01:00:00 1970
+++ gnupg-1.0.5/checks/multisig.test	Thu Apr  5 13:36:55 2001
@@ -0,0 +1,148 @@
+#!/bin/sh
+# Check that gpg verifies only signatures where there is no ambiguity
+# in the order of packets.  Needs the Demo Keys Lima and Mike.
+
+. $srcdir/defs.inc || exit 3
+
+# (variable intialization was created using:
+#   for i in files; do echo "`echo $i | sed 's,[.-],_,g'`='"; \
+#   gpg --no-version --enarmor <$i | grep -v ^Comment:; echo "'" ; done 
+# )
+
+sig_1ls1ls_valid='
+-----BEGIN PGP ARMORED FILE-----
+
+kA0DAAIRN8q1H7eRA/gBrCdiBXRleHQxOogq9EkgYW0gc29ycnksIEkgY2FuJ3Qg
+ZG8gdGhhdAqIPwMFADqIKvQ3yrUft5ED+BEC2joAoJaSaXOZEtSZqQ780HIXG77e
+8PB7AJ4wCprmaFTO0fBaTcXDuEOBdAWnOZANAwACETfKtR+3kQP4AawnYgV0ZXh0
+MTqIKvRJIGFtIHNvcnJ5LCBJIGNhbid0IGRvIHRoYXQKiD8DBQA6iCr0N8q1H7eR
+A/gRAto6AKCWkmlzmRLUmakO/NByFxu+3vDwewCeMAqa5mhUztHwWk3Fw7hDgXQF
+pzk=
+=8jSC
+-----END PGP ARMORED FILE-----
+'
+sig_ls_valid='
+-----BEGIN PGP ARMORED FILE-----
+
+rCdiBXRleHQxOogrS0kgYW0gc29ycnksIEkgY2FuJ3QgZG8gdGhhdAqIPwMFADqI
+K0s3yrUft5ED+BECLQMAn2jZUNOpB4OuurSQkc2TRfg6ek02AJ9+oJS0frQ+yUsT
+QDUFTH2PvZRxjw==
+=J+lb
+-----END PGP ARMORED FILE-----
+'
+sig_sl_valid='
+-----BEGIN PGP ARMORED FILE-----
+
+iD8DBQA6iCtLN8q1H7eRA/gRAi0DAJ9o2VDTqQeDrrq0kJHNk0X4OnpNNgCffqCU
+tH60PslLE0A1BUx9j72UcY+sJ2IFdGV4dDE6iCtLSSBhbSBzb3JyeSwgSSBjYW4n
+dCBkbyB0aGF0Cg==
+=N9MP
+-----END PGP ARMORED FILE-----
+'
+sig_11lss_valid_but_is_not='
+-----BEGIN PGP ARMORED FILE-----
+
+kA0DAAIRN8q1H7eRA/gAkA0DAAIRN8q1H7eRA/gBrCdiBXRleHQxOogyXUkgYW0g
+c29ycnksIEkgY2FuJ3QgZG8gdGhhdAqIPwMFADqIMl03yrUft5ED+BECwQAAnRXT
+mXjVd385oD38W80XuheWKTGcAJ9pZ6/flaKDfw+SLido7xaUHuhp5Yg/AwUAOogy
+XTfKtR+3kQP4EQLBAACgnN0IP+NztE0aAc/DZ17yHWR9diwAniN0P01WmbgZJoZB
+Q341WRXKS/at
+=Ekrs
+-----END PGP ARMORED FILE-----
+'
+sig_11lss11lss_valid_but_is_not='
+-----BEGIN PGP ARMORED FILE-----
+
+kA0DAAIRN8q1H7eRA/gAkA0DAAIRN8q1H7eRA/gBrCdiBXRleHQxOogyXUkgYW0g
+c29ycnksIEkgY2FuJ3QgZG8gdGhhdAqIPwMFADqIMl03yrUft5ED+BECwQAAnRXT
+mXjVd385oD38W80XuheWKTGcAJ9pZ6/flaKDfw+SLido7xaUHuhp5Yg/AwUAOogy
+XTfKtR+3kQP4EQLBAACgnN0IP+NztE0aAc/DZ17yHWR9diwAniN0P01WmbgZJoZB
+Q341WRXKS/atkA0DAAIRN8q1H7eRA/gAkA0DAAIRN8q1H7eRA/gBrCdiBXRleHQx
+OogyXUkgYW0gc29ycnksIEkgY2FuJ3QgZG8gdGhhdAqIPwMFADqIMl03yrUft5ED
++BECwQAAnRXTmXjVd385oD38W80XuheWKTGcAJ9pZ6/flaKDfw+SLido7xaUHuhp
+5Yg/AwUAOogyXTfKtR+3kQP4EQLBAACgnN0IP+NztE0aAc/DZ17yHWR9diwAniN0
+P01WmbgZJoZBQ341WRXKS/at
+=P1Mu
+-----END PGP ARMORED FILE-----
+'
+sig_ssl_valid_but_is_not='
+-----BEGIN PGP ARMORED FILE-----
+
+iD8DBQA6iCtLN8q1H7eRA/gRAi0DAJ9o2VDTqQeDrrq0kJHNk0X4OnpNNgCffqCU
+tH60PslLE0A1BUx9j72UcY+IPwMFADqIK0s3yrUft5ED+BECLQMAn2jZUNOpB4Ou
+urSQkc2TRfg6ek02AJ9+oJS0frQ+yUsTQDUFTH2PvZRxj6wnYgV0ZXh0MTqIK0tJ
+IGFtIHNvcnJ5LCBJIGNhbid0IGRvIHRoYXQK
+=Zven
+-----END PGP ARMORED FILE-----
+'
+sig_1lsls_invalid='
+-----BEGIN PGP ARMORED FILE-----
+
+kA0DAAIRN8q1H7eRA/gBrCdiBXRleHQxOogq9EkgYW0gc29ycnksIEkgY2FuJ3Qg
+ZG8gdGhhdAqIPwMFADqIKvQ3yrUft5ED+BEC2joAoJaSaXOZEtSZqQ780HIXG77e
+8PB7AJ4wCprmaFTO0fBaTcXDuEOBdAWnOawnYgV0ZXh0MTqIK0tJIGFtIHNvcnJ5
+LCBJIGNhbid0IGRvIHRoYXQKiD8DBQA6iCtLN8q1H7eRA/gRAi0DAJ9o2VDTqQeD
+rrq0kJHNk0X4OnpNNgCffqCUtH60PslLE0A1BUx9j72UcY8=
+=nkeu
+-----END PGP ARMORED FILE-----
+'
+sig_lsls_invalid='
+-----BEGIN PGP ARMORED FILE-----
+
+rCdiBXRleHQxOogrS0kgYW0gc29ycnksIEkgY2FuJ3QgZG8gdGhhdAqIPwMFADqI
+K0s3yrUft5ED+BECLQMAn2jZUNOpB4OuurSQkc2TRfg6ek02AJ9+oJS0frQ+yUsT
+QDUFTH2PvZRxj6wnYgV0ZXh0MTqIK0tJIGFtIHNvcnJ5LCBJIGNhbid0IGRvIHRo
+YXQKiD8DBQA6iCtLN8q1H7eRA/gRAi0DAJ9o2VDTqQeDrrq0kJHNk0X4OnpNNgCf
+fqCUtH60PslLE0A1BUx9j72UcY8=
+=BlZH
+-----END PGP ARMORED FILE-----
+'
+sig_lss_invalid='
+-----BEGIN PGP ARMORED FILE-----
+
+rCdiBXRleHQxOogrS0kgYW0gc29ycnksIEkgY2FuJ3QgZG8gdGhhdAqIPwMFADqI
+K0s3yrUft5ED+BECLQMAn2jZUNOpB4OuurSQkc2TRfg6ek02AJ9+oJS0frQ+yUsT
+QDUFTH2PvZRxj4g/AwUAOogrSzfKtR+3kQP4EQItAwCfaNlQ06kHg666tJCRzZNF
++Dp6TTYAn36glLR+tD7JSxNANQVMfY+9lHGP
+=jmt6
+-----END PGP ARMORED FILE-----
+'
+sig_slsl_invalid='
+-----BEGIN PGP ARMORED FILE-----
+
+iD8DBQA6iCtLN8q1H7eRA/gRAi0DAJ9o2VDTqQeDrrq0kJHNk0X4OnpNNgCffqCU
+tH60PslLE0A1BUx9j72UcY+sJ2IFdGV4dDE6iCtLSSBhbSBzb3JyeSwgSSBjYW4n
+dCBkbyB0aGF0Cog/AwUAOogrSzfKtR+3kQP4EQItAwCfaNlQ06kHg666tJCRzZNF
++Dp6TTYAn36glLR+tD7JSxNANQVMfY+9lHGPrCdiBXRleHQxOogrS0kgYW0gc29y
+cnksIEkgY2FuJ3QgZG8gdGhhdAo=
+=phBF
+-----END PGP ARMORED FILE-----
+'
+
+save_IFS="${IFS}"
+IFS=""
+for i in "$sig_1ls1ls_valid" "$sig_ls_valid" "$sig_sl_valid"; do
+    echo "$i" | $srcdir/run-gpg --dearmor >x
+    ../g10/gpg --homedir . --verify x 2>/dev/null || error "valid is invalid"
+done
+#for i in "$sig_11lss_valid_but_is_not" "$sig_11lss11lss_valid_but_is_not" \
+#         "$sig_ssl_valid_but_is_not"; do
+#    echo "$i" | $srcdir/run-gpg --dearmor >x
+#    ../g10/gpg --homedir . --verify <x 2>/dev/null || error "valid is invalid"
+#done
+for i in "$sig_1lsls_invalid" "$sig_lsls_invalid" \
+         "$sig_lss_invalid" "$sig_slsl_invalid" ; do
+    echo "$i" | $srcdir/run-gpg --dearmor >x
+    ../g10/gpg --homedir . --verify <x 2>/dev/null && error "invalid is valid"
+done
+IFS="${save_IFS}"
+
+
+
+
+
+
+
+
+
+
diff -urN gnupg-1.0.4/checks/options.in gnupg-1.0.5/checks/options.in
--- gnupg-1.0.4/checks/options.in	Thu Jan  1 01:00:00 1970
+++ gnupg-1.0.5/checks/options.in	Tue Mar 27 13:41:12 2001
@@ -0,0 +1,5 @@
+no-greeting
+no-secmem-warning
+load-extension ../cipher/tiger
+batch
+emulate-md-encode-bug
diff -urN gnupg-1.0.4/checks/run-gpg.patterns gnupg-1.0.5/checks/run-gpg.patterns
--- gnupg-1.0.4/checks/run-gpg.patterns	Fri Feb 19 15:53:50 1999
+++ gnupg-1.0.5/checks/run-gpg.patterns	Sat Apr 28 21:42:05 2001
@@ -9,3 +9,12 @@
 gpg: WARNING: using insecure random number generator
 gpg: NOTE: signature key expired
 NOTE: this is a development version!
+gpg: encrypted with 
+"test two (no pp) <two@test.nowhere.nil>"
+"Test one (pp=def) <one@test.nowhere.nil>"
+"pgp5 test <pgp5@dev.null>"
+gpg: using secondary key
+secret key 9D266E0F expired at
+: expired at
+gpg: Note: This key has expired!
+gpg: Fingerprint: 0826 1CB7 C976 5344 E207  4184 3C6B BBE6 9D26 6E0F
diff -urN gnupg-1.0.4/checks/sigs.test gnupg-1.0.5/checks/sigs.test
--- gnupg-1.0.4/checks/sigs.test	Sun Oct 25 19:59:51 1998
+++ gnupg-1.0.5/checks/sigs.test	Tue Mar 20 14:47:42 2001
@@ -10,8 +10,8 @@
 done
 
 hash_algo_list="ripemd160 sha1 md5"
-if have_hash_algo "TIGER"; then
-  hash_algo_list="$hash_algo_list tiger"
+if have_hash_algo "TIGER192"; then
+  hash_algo_list="$hash_algo_list tiger192"
 fi
 
 for da in $hash_algo_list ; do
diff -urN gnupg-1.0.4/cipher/ChangeLog gnupg-1.0.5/cipher/ChangeLog
--- gnupg-1.0.4/cipher/ChangeLog	Thu Oct 12 12:18:37 2000
+++ gnupg-1.0.5/cipher/ChangeLog	Sun Apr 29 10:17:25 2001
@@ -1,3 +1,82 @@
+2001-04-29  Werner Koch  <wk@gnupg.org>
+
+	* random.c (fast_random_poll): Do not check the return code of
+	getrusage.
+
+2001-04-17  Werner Koch  <wk@gnupg.org>
+
+	* rndunix.c: Add a signal.h header to avoid warnings on SOlaris 7
+	and 8.
+
+2001-04-16  Werner Koch  <wk@gnupg.org>
+
+	* dynload.c [__MINGW32__]: Applied patch from Timo Schulz to make
+	it work under W32.  This patches is based on the one from
+	Disastry@saiknes.lv
+
+2001-04-06  Werner Koch  <wk@gnupg.org>
+
+	* rijndael.c, des.c, blowfish.c, twofish.c, cast5.c (burn_stack):
+	New.  Add wrappers for most functions to be able to call
+	burn_stack after the function invocation. This methods seems to be
+	the most portable way to zeroise the stack used. It does only work
+	on stack frame based machines but it is highly portable and has no
+	side effects.  Just setting the automatic variables at the end of
+	a function to zero does not work well because the compiler will
+	optimize them away - marking them as volatile woule be bad for
+	performance.
+	* md5.c, sha1.c, rmd160.c, tiger.c (burn_stack): Likewise.
+	* random.c (burn_stack): New.
+	(mix_pool): Use it here to burn the stack of te mixblock function.
+	
+2001-04-02  Werner Koch  <wk@gnupg.org>
+
+	* primegen.c (generate_elg_prime): I was not initialized for mode
+	!= 1.  Freed q at 3 places.  Thanks to  Tommi Komulainen.
+
+2001-03-28  Werner Koch  <wk@gnupg.org>
+
+	* md5.c (md5_final): Fixed calculation of hashed length.  Thanks
+	to disastry@saiknes.lv for pointing out that it was horrible wrong
+	for more than 512MB of input.
+	* sha1.c (sha1_final): Ditto.
+	* rmd160.c (rmd160_final): Ditto.
+	* tiger.c (tiger_final): Ditto.
+
+2001-03-19  Werner Koch  <wk@gnupg.org>
+
+	* blowfish.c (encrypt,do_encrypt): Changed name to do_encrypt to
+	avoid name clahses with an encrypt function in stdlib.h of
+	Dynix/PIX.  Thanks to Gene Carter.
+	* elgamal.c (encrypt,do_encrypt): Ditto.
+
+2001-03-12  Werner Koch  <wk@gnupg.org>
+
+	* twofish.c (gnupgext_enum_func): Add some static when comnpiled
+	as a module.
+
+	* tiger.c (tiger_get_info): Return "TIGER192" and not just
+	"TIGER".  By Edwin Woudt.
+
+2001-03-08  Werner Koch  <wk@gnupg.org>
+
+	* random.c: Always include time.h - standard requirement.  Thanks
+	to James Troup.
+
+2001-01-18  Werner Koch  <wk@gnupg.org>
+
+	* rndw32.c: Fixed typo and wrong ifdef for VER_PLATFORM* macro
+
+2001-01-12  Werner Koch  <wk@gnupg.org>
+
+	* cipher.c (cipher_encrypt,cipher_encrypt): Use blocksize and
+	not 8 for CBC mode (However: we don't use CBS in OpenPGP).
+
+2000-11-22  Werner Koch  <wk@gnupg.org>
+
+	* rndegd.c (gather_random): Fixed default socket to be '=entropy'.
+	Thanks to Tomasz Kozlowski.
+
 2000-10-12  Werner Koch  <wk@gnupg.org>
 
         * rijndael.c: New.
@@ -681,5 +760,17 @@
 	* misc.c (cipher_algo_to_string): New
 	(pubkey_algo_to_string): New.
 	(digest_algo_to_string): New.
+
+
+
+ Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 
diff -urN gnupg-1.0.4/cipher/Makefile.am gnupg-1.0.5/cipher/Makefile.am
--- gnupg-1.0.4/cipher/Makefile.am	Thu Oct 12 12:27:08 2000
+++ gnupg-1.0.5/cipher/Makefile.am	Thu Mar  8 14:47:11 2001
@@ -1,3 +1,21 @@
+# Copyright (C) 1998, 1999, 2000, 2001 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
+
 ## Process this file with automake to produce Makefile.in
 
 
diff -urN gnupg-1.0.4/cipher/Makefile.in gnupg-1.0.5/cipher/Makefile.in
--- gnupg-1.0.4/cipher/Makefile.in	Tue Oct 17 15:40:21 2000
+++ gnupg-1.0.5/cipher/Makefile.in	Sun Apr 29 16:39:07 2001
@@ -10,6 +10,24 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+# Copyright (C) 1998, 1999, 2000, 2001 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
+
 
 SHELL = @SHELL@
 
@@ -72,6 +90,7 @@
 DATADIRNAME = @DATADIRNAME@
 DLLTOOL = @DLLTOOL@
 DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
+DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@
 DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@
 DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@
 FAQPROG = @FAQPROG@
diff -urN gnupg-1.0.4/cipher/blowfish.c gnupg-1.0.5/cipher/blowfish.c
--- gnupg-1.0.4/cipher/blowfish.c	Fri Jan 14 18:25:56 2000
+++ gnupg-1.0.5/cipher/blowfish.c	Sat Apr 28 18:24:36 2001
@@ -1,9 +1,5 @@
 /* blowfish.c  -  Blowfish encryption
- *	Copyright (C) 1998 Free Software Foundation, Inc.
- *
- * For a description of the algorithm, see:
- *   Bruce Schneier: Applied Cryptography. John Wiley & Sons, 1996.
- *   ISBN 0-471-11709-9. Pages 336 ff.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -20,6 +16,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * For a description of the algorithm, see:
+ *   Bruce Schneier: Applied Cryptography. John Wiley & Sons, 1996.
+ *   ISBN 0-471-11709-9. Pages 336 ff.
  */
 
 /* Test values:
@@ -278,9 +278,20 @@
 #endif
 #define R(l,r,i)  do { l ^= p[i]; r ^= F(l); } while(0)
 
+static void
+burn_stack (int bytes)
+{
+    char buf[64];
+    
+    memset (buf, 0, sizeof buf);
+    bytes -= sizeof buf;
+    if (bytes > 0)
+        burn_stack (bytes);
+}
+
 
 static void
-encrypt(  BLOWFISH_context *bc, u32 *ret_xl, u32 *ret_xr )
+do_encrypt(  BLOWFISH_context *bc, u32 *ret_xl, u32 *ret_xr )
 {
   #if BLOWFISH_ROUNDS == 16
     u32 xl, xr, *s0, *s1, *s2, *s3, *p;
@@ -413,13 +424,13 @@
 #undef R
 
 static void
-encrypt_block( BLOWFISH_context *bc, byte *outbuf, byte *inbuf )
+do_encrypt_block( BLOWFISH_context *bc, byte *outbuf, byte *inbuf )
 {
     u32 d1, d2;
 
     d1 = inbuf[0] << 24 | inbuf[1] << 16 | inbuf[2] << 8 | inbuf[3];
     d2 = inbuf[4] << 24 | inbuf[5] << 16 | inbuf[6] << 8 | inbuf[7];
-    encrypt( bc, &d1, &d2 );
+    do_encrypt( bc, &d1, &d2 );
     outbuf[0] = (d1 >> 24) & 0xff;
     outbuf[1] = (d1 >> 16) & 0xff;
     outbuf[2] = (d1 >>	8) & 0xff;
@@ -430,9 +441,15 @@
     outbuf[7] =  d2	   & 0xff;
 }
 
+static void
+encrypt_block( BLOWFISH_context *bc, byte *outbuf, byte *inbuf )
+{
+    do_encrypt_block (bc, outbuf, inbuf);
+    burn_stack (64);
+}
 
 static void
-decrypt_block( BLOWFISH_context *bc, byte *outbuf, byte *inbuf )
+do_decrypt_block( BLOWFISH_context *bc, byte *outbuf, byte *inbuf )
 {
     u32 d1, d2;
 
@@ -449,6 +466,13 @@
     outbuf[7] =  d2	   & 0xff;
 }
 
+static void
+decrypt_block( BLOWFISH_context *bc, byte *outbuf, byte *inbuf )
+{
+    do_decrypt_block (bc, outbuf, inbuf);
+    burn_stack (64);
+}
+
 
 static const char*
 selftest(void)
@@ -481,7 +505,7 @@
 
 
 static int
-bf_setkey( BLOWFISH_context *c, byte *key, unsigned keylen )
+do_bf_setkey( BLOWFISH_context *c, byte *key, unsigned keylen )
 {
     int i, j;
     u32 data, datal, datar;
@@ -524,27 +548,27 @@
 
     datal = datar = 0;
     for(i=0; i < BLOWFISH_ROUNDS+2; i += 2 ) {
-	encrypt( c, &datal, &datar );
+	do_encrypt( c, &datal, &datar );
 	c->p[i]   = datal;
 	c->p[i+1] = datar;
     }
     for(i=0; i < 256; i += 2 )	{
-	encrypt( c, &datal, &datar );
+	do_encrypt( c, &datal, &datar );
 	c->s0[i]   = datal;
 	c->s0[i+1] = datar;
     }
     for(i=0; i < 256; i += 2 )	{
-	encrypt( c, &datal, &datar );
+	do_encrypt( c, &datal, &datar );
 	c->s1[i]   = datal;
 	c->s1[i+1] = datar;
     }
     for(i=0; i < 256; i += 2 )	{
-	encrypt( c, &datal, &datar );
+	do_encrypt( c, &datal, &datar );
 	c->s2[i]   = datal;
 	c->s2[i+1] = datar;
     }
     for(i=0; i < 256; i += 2 )	{
-	encrypt( c, &datal, &datar );
+	do_encrypt( c, &datal, &datar );
 	c->s3[i]   = datal;
 	c->s3[i+1] = datar;
     }
@@ -563,6 +587,13 @@
     return 0;
 }
 
+static int
+bf_setkey( BLOWFISH_context *c, byte *key, unsigned keylen )
+{
+    int rc = do_bf_setkey (c, key, keylen);
+    burn_stack (64);
+    return rc;
+}
 
 /****************
  * Return some information about the algorithm.  We need algo here to
diff -urN gnupg-1.0.4/cipher/cast5.c gnupg-1.0.5/cipher/cast5.c
--- gnupg-1.0.4/cipher/cast5.c	Fri Jan 14 18:25:56 2000
+++ gnupg-1.0.5/cipher/cast5.c	Sat Apr 28 18:25:01 2001
@@ -1,5 +1,5 @@
 /* cast5.c  -  CAST5 cipher (RFC2144)
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -355,7 +355,19 @@
     (((s1[I >> 24] + s2[(I>>16)&0xff]) ^ s3[(I>>8)&0xff]) - s4[I&0xff]) )
 
 static void
-encrypt_block( CAST5_context *c, byte *outbuf, byte *inbuf )
+burn_stack (int bytes)
+{
+    char buf[64];
+    
+    memset (buf, 0, sizeof buf);
+    bytes -= sizeof buf;
+    if (bytes > 0)
+        burn_stack (bytes);
+}
+
+
+static void
+do_encrypt_block( CAST5_context *c, byte *outbuf, byte *inbuf )
 {
     u32 l, r, t;
     u32 I;   /* used by the Fx macros */
@@ -409,7 +421,14 @@
 }
 
 static void
-decrypt_block(	CAST5_context *c, byte *outbuf, byte *inbuf )
+encrypt_block( CAST5_context *c, byte *outbuf, byte *inbuf )
+{
+    do_encrypt_block (c, outbuf, inbuf);
+    burn_stack (20+4*sizeof(void*));
+}
+
+static void
+do_decrypt_block (CAST5_context *c, byte *outbuf, byte *inbuf )
 {
     u32 l, r, t;
     u32 I;
@@ -449,6 +468,12 @@
     outbuf[7] =  l	  & 0xff;
 }
 
+static void
+decrypt_block( CAST5_context *c, byte *outbuf, byte *inbuf )
+{
+    do_decrypt_block (c, outbuf, inbuf);
+    burn_stack (20+4*sizeof(void*));
+}
 
 
 static const char*
@@ -547,7 +572,7 @@
 
 
 static int
-cast_setkey( CAST5_context *c, byte *key, unsigned keylen )
+do_cast_setkey( CAST5_context *c, byte *key, unsigned keylen )
 {
   static int initialized;
   static const char* selftest_failed;
@@ -589,6 +614,13 @@
     return 0;
 }
 
+static int
+cast_setkey( CAST5_context *c, byte *key, unsigned keylen )
+{
+    int rc = do_cast_setkey (c, key, keylen);
+    burn_stack (96+7*sizeof(void*));
+    return rc;
+}
 
 /****************
  * Return some information about the algorithm.  We need algo here to
diff -urN gnupg-1.0.4/cipher/cipher.c gnupg-1.0.5/cipher/cipher.c
--- gnupg-1.0.4/cipher/cipher.c	Thu Oct 12 12:26:01 2000
+++ gnupg-1.0.5/cipher/cipher.c	Sat Apr 28 18:25:21 2001
@@ -1,5 +1,5 @@
 /* cipher.c  -	cipher dispatcher
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -619,12 +619,12 @@
 {
     switch( c->mode ) {
       case CIPHER_MODE_ECB:
-	assert(!(nbytes%8));
-	do_ecb_encrypt(c, outbuf, inbuf, nbytes/8 );
+	assert(!(nbytes%c->blocksize));
+	do_ecb_encrypt(c, outbuf, inbuf, nbytes/c->blocksize );
 	break;
       case CIPHER_MODE_CBC:
-	assert(!(nbytes%8));  /* fixme: should be blocksize */
-	do_cbc_encrypt(c, outbuf, inbuf, nbytes/8 );
+	assert(!(nbytes%c->blocksize));  
+	do_cbc_encrypt(c, outbuf, inbuf, nbytes/c->blocksize );
 	break;
       case CIPHER_MODE_CFB:
       case CIPHER_MODE_PHILS_CFB:
@@ -649,12 +649,12 @@
 {
     switch( c->mode ) {
       case CIPHER_MODE_ECB:
-	assert(!(nbytes%8));
-	do_ecb_decrypt(c, outbuf, inbuf, nbytes/8 );
+	assert(!(nbytes%c->blocksize));
+	do_ecb_decrypt(c, outbuf, inbuf, nbytes/c->blocksize );
 	break;
       case CIPHER_MODE_CBC:
-	assert(!(nbytes%8));	/* fixme: should assert on blocksize */
-	do_cbc_decrypt(c, outbuf, inbuf, nbytes/8 );
+	assert(!(nbytes%c->blocksize));
+	do_cbc_decrypt(c, outbuf, inbuf, nbytes/c->blocksize );
 	break;
       case CIPHER_MODE_CFB:
       case CIPHER_MODE_PHILS_CFB:
diff -urN gnupg-1.0.4/cipher/des.c gnupg-1.0.5/cipher/des.c
--- gnupg-1.0.4/cipher/des.c	Fri Jan 14 18:25:56 2000
+++ gnupg-1.0.5/cipher/des.c	Sat Apr 28 18:26:23 2001
@@ -1,12 +1,5 @@
 /* des.c - DES and Triple-DES encryption/decryption Algorithm
- *	Copyright (C) 1998, 1999 Free Software Foundation, Inc.
- *
- * Please see below for more legal information!
- *
- * According to the definition of DES in FIPS PUB 46-2 from December 1993.
- * For a description of triple encryption, see:
- *   Bruce Schneier: Applied Cryptography. Second Edition.
- *   John Wiley & Sons, 1996. ISBN 0-471-12845-7. Pages 358 ff.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -23,6 +16,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ *
+ * According to the definition of DES in FIPS PUB 46-2 from December 1993.
+ * For a description of triple encryption, see:
+ *   Bruce Schneier: Applied Cryptography. Second Edition.
+ *   John Wiley & Sons, 1996. ISBN 0-471-12845-7. Pages 358 ff.
  */
 
 
@@ -449,9 +448,16 @@
 #define tripledes_ecb_decrypt(ctx, from, to)	tripledes_ecb_crypt(ctx, from, to, 1)
 
 
-
-
-
+static void
+burn_stack (int bytes)
+{
+    char buf[64];
+    
+    memset (buf, 0, sizeof buf);
+    bytes -= sizeof buf;
+    if (bytes > 0)
+        burn_stack (bytes);
+}
 
 /*
  * des_key_schedule():	  Calculate 16 subkeys pairs (even/odd) for
@@ -558,6 +564,7 @@
     return G10ERR_SELFTEST_FAILED;
 
   des_key_schedule (key, ctx->encrypt_subkeys);
+  burn_stack (32);
 
   for(i=0; i<32; i+=2)
     {
@@ -616,6 +623,7 @@
 
   des_key_schedule (key1, ctx->encrypt_subkeys);
   des_key_schedule (key2, &(ctx->decrypt_subkeys[32]));
+  burn_stack (32);
 
   for(i=0; i<32; i+=2)
     {
@@ -653,6 +661,7 @@
   des_key_schedule (key1, ctx->encrypt_subkeys);
   des_key_schedule (key2, &(ctx->decrypt_subkeys[32]));
   des_key_schedule (key3, &(ctx->encrypt_subkeys[64]));
+  burn_stack (32);
 
   for(i=0; i<32; i+=2)
     {
@@ -947,8 +956,11 @@
 
     tripledes_set3keys ( ctx, key, key+8, key+16);
 
-    if( is_weak_key( key ) || is_weak_key( key+8 ) || is_weak_key( key+16 ) )
+    if( is_weak_key( key ) || is_weak_key( key+8 ) || is_weak_key( key+16 ) ) {
+        burn_stack (64);
 	return G10ERR_WEAK_KEY;
+    }
+    burn_stack (64); 
 
     return 0;
 }
@@ -958,12 +970,14 @@
 do_tripledes_encrypt( struct _tripledes_ctx *ctx, byte *outbuf, byte *inbuf )
 {
     tripledes_ecb_encrypt ( ctx, inbuf, outbuf );
+    burn_stack (32);
 }
 
 static void
 do_tripledes_decrypt( struct _tripledes_ctx *ctx, byte *outbuf, byte *inbuf )
 {
     tripledes_ecb_decrypt ( ctx, inbuf, outbuf );
+    burn_stack (32);
 }
 
 
diff -urN gnupg-1.0.4/cipher/dsa.c gnupg-1.0.5/cipher/dsa.c
--- gnupg-1.0.4/cipher/dsa.c	Thu May 18 08:31:29 2000
+++ gnupg-1.0.5/cipher/dsa.c	Sun Apr 29 15:44:31 2001
@@ -1,5 +1,5 @@
-/* dsa.c  -  DSA signature scheme
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+/* dsa.c  -  DSA signature algorithm
+ *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -273,6 +273,9 @@
 
 /****************
  * Make a DSA signature from HASH and put it into r and s.
+ *
+ * Without generating the k this function runs in 
+ * about 26ms on a 300 Mhz Mobile Pentium
  */
 
 static void
@@ -307,6 +310,9 @@
 
 /****************
  * Returns true if the signature composed from R and S is valid.
+ *
+ * Without the checks this function runs in 
+ * about 31ms on a 300 Mhz Mobile Pentium
  */
 static int
 verify(MPI r, MPI s, MPI hash, DSA_public_key *pkey )
diff -urN gnupg-1.0.4/cipher/dsa.h gnupg-1.0.5/cipher/dsa.h
--- gnupg-1.0.4/cipher/dsa.h	Tue Feb 16 14:16:22 1999
+++ gnupg-1.0.5/cipher/dsa.h	Sun Apr 29 15:44:45 2001
@@ -1,4 +1,4 @@
-/* dsa.h  -  DSA signature scheme
+/* dsa.h  -  DSA signature algorithm
  *	Copyright (C) 1998 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
diff -urN gnupg-1.0.4/cipher/dynload.c gnupg-1.0.5/cipher/dynload.c
--- gnupg-1.0.4/cipher/dynload.c	Sat Jun 26 12:22:51 1999
+++ gnupg-1.0.5/cipher/dynload.c	Sun Apr 29 15:45:42 2001
@@ -1,5 +1,5 @@
 /* dynload.c - load cipher extensions
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -31,6 +31,9 @@
   #include <dl.h>
   #include <errno.h>
 #endif
+#ifdef __MINGW32__
+  #include <windows.h>
+#endif
 #include "util.h"
 #include "cipher.h"
 #include "dynload.h"
@@ -67,6 +70,57 @@
 }
 #endif /*HAVE_DL_SHL_LOAD*/
 
+#ifdef __MINGW32__
+#define HAVE_DL_DLOPEN
+#define USE_DYNAMIC_LINKING
+
+static int last_error = 0;
+    
+void*
+dlopen(const char *pathname, int mode)
+{
+	void *h = LoadLibrary( pathname );
+	if (!h) {
+	log_error( "LoadLibrary failed ec=%d\n", (int)GetLastError() );
+	last_error = 1;
+	return NULL;
+	}
+	return h;
+}
+
+int
+dlclose( void *handle )
+{
+	last_error = 0;
+	return	FreeLibrary( handle );
+}
+
+char*
+dlerror(void)
+{
+	static char dlerrstr[10];
+	if (last_error) {
+	sprintf(dlerrstr, "%d", (int)GetLastError() );
+	return dlerrstr;
+	}
+	return NULL;
+}
+
+void*
+dlsym( void *handle, const char *name )
+{
+	void *h = GetProcAddress( handle, name );
+	if (!h) {
+	log_error( "GetProcAddress failed ec=%d\n", (int)GetLastError() );
+	last_error = 1;
+	return NULL;
+	}
+	return h;
+}
+#endif /*__MINGW32__*/
+
+
+
 
 
 typedef struct ext_list {
@@ -219,9 +273,11 @@
     int rc;
   #endif
 
+  #ifndef __MINGW32__
     /* make sure we are not setuid */
     if( getuid() != geteuid() )
 	log_bug("trying to load an extension while still setuid\n");
+  #endif
 
     /* now that we are not setuid anymore, we can safely load modules */
   #ifdef HAVE_DL_DLOPEN
diff -urN gnupg-1.0.4/cipher/dynload.h gnupg-1.0.5/cipher/dynload.h
--- gnupg-1.0.4/cipher/dynload.h	Tue Feb 16 14:16:22 1999
+++ gnupg-1.0.5/cipher/dynload.h	Sun Apr 29 15:46:13 2001
@@ -1,4 +1,4 @@
-/* dynload.5
+/* dynload.h
  *	Copyright (C) 1998 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
diff -urN gnupg-1.0.4/cipher/elgamal.c gnupg-1.0.5/cipher/elgamal.c
--- gnupg-1.0.4/cipher/elgamal.c	Tue Jun 27 16:21:13 2000
+++ gnupg-1.0.5/cipher/elgamal.c	Sat Apr 28 18:27:50 2001
@@ -1,5 +1,5 @@
 /* elgamal.c  -  ElGamal Public Key encryption
- *	Copyright (C) 1998, 2000 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 2000, 2001 Free Software Foundation, Inc.
  *
  * For a description of the algorithm, see:
  *   Bruce Schneier: Applied Cryptography. John Wiley & Sons, 1996.
@@ -50,7 +50,7 @@
 static MPI gen_k( MPI p );
 static void generate( ELG_secret_key *sk, unsigned nbits, MPI **factors );
 static int  check_secret_key( ELG_secret_key *sk );
-static void encrypt(MPI a, MPI b, MPI input, ELG_public_key *pkey );
+static void do_encrypt(MPI a, MPI b, MPI input, ELG_public_key *pkey );
 static void decrypt(MPI output, MPI a, MPI b, ELG_secret_key *skey );
 static void sign(MPI a, MPI b, MPI input, ELG_secret_key *skey);
 static int  verify(MPI a, MPI b, MPI input, ELG_public_key *pkey);
@@ -136,7 +136,7 @@
 	m_free(p);
     }
 
-    encrypt( out1_a, out1_b, test, &pk );
+    do_encrypt( out1_a, out1_b, test, &pk );
     decrypt( out2, out1_a, out1_b, sk );
     if( mpi_cmp( test, out2 ) )
 	log_fatal("ElGamal operation: encrypt, decrypt failed\n");
@@ -338,7 +338,7 @@
 
 
 static void
-encrypt(MPI a, MPI b, MPI input, ELG_public_key *pkey )
+do_encrypt(MPI a, MPI b, MPI input, ELG_public_key *pkey )
 {
     MPI k;
 
@@ -557,7 +557,7 @@
     pk.y = pkey[2];
     resarr[0] = mpi_alloc( mpi_get_nlimbs( pk.p ) );
     resarr[1] = mpi_alloc( mpi_get_nlimbs( pk.p ) );
-    encrypt( resarr[0], resarr[1], data, &pk );
+    do_encrypt( resarr[0], resarr[1], data, &pk );
     return 0;
 }
 
diff -urN gnupg-1.0.4/cipher/g10c.c gnupg-1.0.5/cipher/g10c.c
--- gnupg-1.0.4/cipher/g10c.c	Sat Feb 20 21:45:35 1999
+++ gnupg-1.0.5/cipher/g10c.c	Sun Apr 29 16:07:57 2001
@@ -1,5 +1,5 @@
 /* g10c.c  -  Wrapper for cipher functions
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -29,7 +29,7 @@
 /* FIXME: The modules should use functions from libgcrypt */
 
 
-const char *g10c_revision_string(int dummy) { return "$Revision: 1.6 $"; }
+const char *g10c_revision_string(int dummy) { return "$Revision: 1.6.2.2 $"; }
 
 MPI
 g10c_generate_secret_prime( unsigned nbits )
diff -urN gnupg-1.0.4/cipher/md.c gnupg-1.0.5/cipher/md.c
--- gnupg-1.0.4/cipher/md.c	Mon Oct  4 21:26:53 1999
+++ gnupg-1.0.5/cipher/md.c	Sun Apr 29 15:48:16 2001
@@ -1,5 +1,5 @@
 /* md.c  -  message digest dispatcher
- *	Copyright (C) 1998,1999 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/cipher/md5.c gnupg-1.0.5/cipher/md5.c
--- gnupg-1.0.4/cipher/md5.c	Fri Jan 14 18:25:56 2000
+++ gnupg-1.0.5/cipher/md5.c	Sat Apr 28 20:52:39 2001
@@ -1,8 +1,6 @@
 /* md5.c - MD5 Message-Digest Algorithm
- *	Copyright (C) 1995, 1996, 1998, 1999 Free Software Foundation, Inc.
- *
- * according to the definition of MD5 in RFC 1321 from April 1992.
- * NOTE: This is *not* the same file as the one from glibc.
+ * Copyright (C) 1995, 1996, 1998, 1999,
+ *               2000, 2001 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -17,9 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * According to the definition of MD5 in RFC 1321 from April 1992.
+ * NOTE: This is *not* the same file as the one from glibc.
  */
 /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.  */
-/* heavily modified for GnuPG by <werner.koch@guug.de> */
+/* Heavily modified for GnuPG by <wk@gnupg.org> */
 
 /* Test values:
  * ""                  D4 1D 8C D9 8F 00 B2 04  E9 80 09 98 EC F8 42 7E
@@ -72,6 +73,18 @@
 #define FH(b, c, d) (b ^ c ^ d)
 #define FI(b, c, d) (c ^ (b | ~d))
 
+static void
+burn_stack (int bytes)
+{
+    char buf[128];
+    
+    memset (buf, 0, sizeof buf);
+    bytes -= sizeof buf;
+    if (bytes > 0)
+        burn_stack (bytes);
+}
+
+
 
 /****************
  * transform n*64 bytes
@@ -217,6 +230,7 @@
 {
     if( hd->count == 64 ) { /* flush the buffer */
 	transform( hd, hd->buf );
+        burn_stack (80+6*sizeof(void*));
 	hd->count = 0;
 	hd->nblocks++;
     }
@@ -237,9 +251,9 @@
 	inlen -= 64;
 	inbuf += 64;
     }
+    burn_stack (80+6*sizeof(void*));
     for( ; inlen && hd->count < 64; inlen-- )
 	hd->buf[hd->count++] = *inbuf++;
-
 }
 
 
@@ -258,18 +272,19 @@
 
     md5_write(hd, NULL, 0); /* flush */;
 
-    msb = 0;
     t = hd->nblocks;
-    if( (lsb = t << 6) < t ) /* multiply by 64 to make a byte count */
-	msb++;
-    msb += t >> 26;
+    /* multiply by 64 to make a byte count */
+    lsb = t << 6;
+    msb = t >> 26;
+    /* add the count */
     t = lsb;
-    if( (lsb = t + hd->count) < t ) /* add the count */
+    if( (lsb += hd->count) < t )
 	msb++;
+    /* multiply by 8 to make a bit count */
     t = lsb;
-    if( (lsb = t << 3) < t ) /* multiply by 8 to make a bit count */
-	msb++;
-    msb += t >> 29;
+    lsb <<= 3;
+    msb <<= 3;
+    msb |= t >> 29;
 
     if( hd->count < 56 ) { /* enough room */
 	hd->buf[hd->count++] = 0x80; /* pad */
@@ -293,6 +308,7 @@
     hd->buf[62] = msb >> 16;
     hd->buf[63] = msb >> 24;
     transform( hd, hd->buf );
+    burn_stack (80+6*sizeof(void*));
 
     p = hd->buf;
   #ifdef BIG_ENDIAN_HOST
@@ -356,7 +372,7 @@
 #ifndef IS_MODULE
 static
 #endif
-const char * const gnupgext_version = "MD5 ($Revision: 1.15.2.1 $)";
+const char * const gnupgext_version = "MD5 ($Revision: 1.15.2.4 $)";
 
 static struct {
     int class;
diff -urN gnupg-1.0.4/cipher/primegen.c gnupg-1.0.5/cipher/primegen.c
--- gnupg-1.0.4/cipher/primegen.c	Thu May 18 08:31:43 2000
+++ gnupg-1.0.5/cipher/primegen.c	Sat Apr 28 18:30:18 2001
@@ -1,5 +1,5 @@
 /* primegen.c - prime number generator
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -190,6 +190,7 @@
 		count1 = 0;
 		qbits++;
 		progress('>');
+                mpi_free (q);
 		q = gen_prime( qbits, 0, 0 );
 		goto next_try;
 	    }
@@ -201,6 +202,7 @@
 		count2 = 0;
 		qbits--;
 		progress('<');
+                mpi_free (q);
 		q = gen_prime( qbits, 0, 0 );
 		goto next_try;
 	    }
@@ -227,8 +229,8 @@
 
     if( ret_factors ) { /* caller wants the factors */
 	*ret_factors = m_alloc_clear( (n+2) * sizeof **ret_factors);
+        i = 0;
 	if( mode == 1 ) {
-	    i = 0;
 	    (*ret_factors)[i++] = mpi_copy( q_factor );
 	    for(; i <= n; i++ )
 		(*ret_factors)[i] = mpi_copy( factors[i] );
@@ -283,6 +285,7 @@
     m_free( pool );
     m_free(perms);
     mpi_free(val_2);
+    mpi_free(q);
     return prime;
 }
 
diff -urN gnupg-1.0.4/cipher/pubkey.c gnupg-1.0.5/cipher/pubkey.c
--- gnupg-1.0.4/cipher/pubkey.c	Wed Sep  6 16:37:17 2000
+++ gnupg-1.0.5/cipher/pubkey.c	Sat Apr 28 18:30:26 2001
@@ -1,5 +1,5 @@
 /* pubkey.c  -	pubkey dispatcher
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/cipher/rand-internal.h gnupg-1.0.5/cipher/rand-internal.h
--- gnupg-1.0.4/cipher/rand-internal.h	Wed Dec 23 13:41:15 1998
+++ gnupg-1.0.5/cipher/rand-internal.h	Sat Apr 28 18:30:34 2001
@@ -1,5 +1,5 @@
 /* rand-internal.h - header to glue the random functions
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/cipher/random.c gnupg-1.0.5/cipher/random.c
--- gnupg-1.0.4/cipher/random.c	Thu Sep 14 12:59:59 2000
+++ gnupg-1.0.5/cipher/random.c	Sun Apr 29 10:17:42 2001
@@ -1,5 +1,5 @@
 /* random.c  -	random number generator
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -32,6 +32,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
+#include <time.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -43,9 +44,6 @@
 #ifdef HAVE_GETTIMEOFDAY
   #include <sys/times.h>
 #endif
-#ifdef HAVE_CLOCK_GETTIME
-  #include <time.h>
-#endif
 #ifdef HAVE_GETRUSAGE
   #include <sys/resource.h>
 #endif
@@ -141,6 +139,16 @@
     cipher_modules_constructor();
 }
 
+static void
+burn_stack (int bytes)
+{
+    char buf[128];
+    
+    memset (buf, 0, sizeof buf);
+    bytes -= sizeof buf;
+    if (bytes > 0)
+        burn_stack (bytes);
+}
 
 void
 random_dump_stats()
@@ -271,6 +279,7 @@
 	rmd160_mixblock( &md, hashbuf);
 	memcpy(p, hashbuf, 20 );
     }
+    burn_stack (200); /* for the rmd160_mixblock() */
 }
 
 
@@ -595,9 +604,11 @@
     #else
     {	struct rusage 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 whatever is in buf.  In a chroot environment it might not
+         * work at all (i.e. because /proc/ is not accessible), so we better 
+         * ognore all error codes and hope for the best
+         */
+        getrusage( RUSAGE_SELF, &buf );
         
 	add_randomness( &buf, sizeof buf, 1 );
 	memset( &buf, 0, sizeof buf );
diff -urN gnupg-1.0.4/cipher/random.h gnupg-1.0.5/cipher/random.h
--- gnupg-1.0.4/cipher/random.h	Thu Mar  2 15:45:05 2000
+++ gnupg-1.0.5/cipher/random.h	Sat Apr 28 18:30:55 2001
@@ -1,5 +1,5 @@
 /* random.h - random functions
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/cipher/rijndael.c gnupg-1.0.5/cipher/rijndael.c
--- gnupg-1.0.4/cipher/rijndael.c	Thu Oct 12 16:33:57 2000
+++ gnupg-1.0.5/cipher/rijndael.c	Sat Apr 28 20:52:39 2001
@@ -1,5 +1,5 @@
 /* Rijndael (AES) for GnuPG
- *	Copyright (C) 2000 Free Software Foundation, Inc.
+ *	Copyright (C) 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -1707,10 +1707,23 @@
 };
 
 
+
+static void
+burn_stack (int bytes)
+{
+    char buf[64];
+    
+    memset (buf, 0, sizeof buf);
+    bytes -= sizeof buf;
+    if (bytes > 0)
+        burn_stack (bytes);
+}
+
+
 /* Perform the key setup.
  */  
 static int
-rijndael_setkey (RIJNDAEL_context *ctx, const byte *key, const unsigned keylen)
+do_setkey (RIJNDAEL_context *ctx, const byte *key, const unsigned keylen)
 {
     static int initialized = 0;
     static const char *selftest_failed=0;
@@ -1719,6 +1732,7 @@
     int i,j, r, t, rconpointer = 0;
     byte tk[MAXKC][4];
     int KC;
+    /* space for automatic variables is about 64 + 11*int */
 
     if (!initialized) {
         initialized = 1;
@@ -1809,6 +1823,14 @@
     return 0;
 }
 
+static int
+rijndael_setkey (RIJNDAEL_context *ctx, const byte *key, const unsigned keylen)
+{
+    int rc = do_setkey (ctx, key, keylen);
+    burn_stack ( 100 + 16*sizeof(int));
+    return rc;
+}
+
 /* make a decryption  key from an encryption key */
 static void
 prepare_decryption( RIJNDAEL_context *ctx )
@@ -1847,7 +1869,7 @@
 
 /* Encrypt one block.  A and B may be the same. */
 static void
-rijndael_encrypt (const RIJNDAEL_context *ctx, byte *b, const byte *a)
+do_encrypt (const RIJNDAEL_context *ctx, byte *b, const byte *a)
 {
     int r;
     byte temp[4][4];
@@ -1924,10 +1946,18 @@
     *((u32*)(b+12)) ^= *((u32*)rk[ROUNDS][3]);
   #undef rk
 }
+
+static void
+rijndael_encrypt (const RIJNDAEL_context *ctx, byte *b, const byte *a)
+{
+    do_encrypt (ctx, b, a);
+    burn_stack (16 + 2*sizeof(int));
+}
+
 
 /* Decrypt one block.  a and b may be the same. */
 static void
-rijndael_decrypt (RIJNDAEL_context *ctx, byte *b, const byte *a)
+do_decrypt (RIJNDAEL_context *ctx, byte *b, const byte *a)
 {
   #define rk  (ctx->keySched2)
     int ROUNDS = ctx->ROUNDS; 
@@ -1936,6 +1966,7 @@
 
     if ( !ctx->decryption_prepared ) {
         prepare_decryption ( ctx );
+        burn_stack (64);
         ctx->decryption_prepared = 1;
     }
     
@@ -2009,6 +2040,13 @@
 	*((u32*)(b+12)) ^= *((u32*)rk[0][3]);
   #undef rk
 }
+
+static void
+rijndael_decrypt (RIJNDAEL_context *ctx, byte *b, const byte *a)
+{
+    do_decrypt (ctx, b, a);
+    burn_stack (16+2*sizeof(int));
+}
 
 /* Test a single encryption and decryption with each key size. */
 
@@ -2124,7 +2162,7 @@
 
 #ifdef IS_MODULE
 static
-const char * const gnupgext_version = "RIJNDAEL ($Revision: 1.1.2.1 $)";
+const char * const gnupgext_version = "RIJNDAEL ($Revision: 1.1.2.3 $)";
 
 static struct {
     int class;
diff -urN gnupg-1.0.4/cipher/rmd.h gnupg-1.0.5/cipher/rmd.h
--- gnupg-1.0.4/cipher/rmd.h	Wed Feb 10 17:22:21 1999
+++ gnupg-1.0.5/cipher/rmd.h	Sat Apr 28 18:31:26 2001
@@ -1,5 +1,5 @@
 /* rmd.h - RIPE-MD hash functions
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/cipher/rmd160.c gnupg-1.0.5/cipher/rmd160.c
--- gnupg-1.0.4/cipher/rmd160.c	Fri Jan 14 18:25:56 2000
+++ gnupg-1.0.5/cipher/rmd160.c	Sat Apr 28 20:52:40 2001
@@ -1,5 +1,5 @@
 /* rmd160.c  -	RIPE-MD160
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -141,6 +141,18 @@
  * 1 million times "a"   52783243c1697bdbe16d37f97f68f08325dc1528
  */
 
+static void
+burn_stack (int bytes)
+{
+    char buf[150];
+    
+    memset (buf, 0, sizeof buf);
+    bytes -= sizeof buf;
+    if (bytes > 0)
+        burn_stack (bytes);
+}
+
+
 
 void
 rmd160_init( RMD160_CONTEXT *hd )
@@ -405,6 +417,7 @@
 {
     if( hd->count == 64 ) { /* flush the buffer */
 	transform( hd, hd->buf );
+        burn_stack (108+5*sizeof(void*));
 	hd->count = 0;
 	hd->nblocks++;
     }
@@ -425,6 +438,7 @@
 	inlen -= 64;
 	inbuf += 64;
     }
+    burn_stack (108+5*sizeof(void*));
     for( ; inlen && hd->count < 64; inlen-- )
 	hd->buf[hd->count++] = *inbuf++;
 }
@@ -461,18 +475,19 @@
 
     rmd160_write(hd, NULL, 0); /* flush */;
 
-    msb = 0;
     t = hd->nblocks;
-    if( (lsb = t << 6) < t ) /* multiply by 64 to make a byte count */
-	msb++;
-    msb += t >> 26;
+    /* multiply by 64 to make a byte count */
+    lsb = t << 6;
+    msb = t >> 26;
+    /* add the count */
     t = lsb;
-    if( (lsb = t + hd->count) < t ) /* add the count */
+    if( (lsb += hd->count) < t )
 	msb++;
+    /* multiply by 8 to make a bit count */
     t = lsb;
-    if( (lsb = t << 3) < t ) /* multiply by 8 to make a bit count */
-	msb++;
-    msb += t >> 29;
+    lsb <<= 3;
+    msb <<= 3;
+    msb |= t >> 29;
 
     if( hd->count < 56 ) { /* enough room */
 	hd->buf[hd->count++] = 0x80; /* pad */
@@ -496,6 +511,7 @@
     hd->buf[62] = msb >> 16;
     hd->buf[63] = msb >> 24;
     transform( hd, hd->buf );
+    burn_stack (108+5*sizeof(void*));
 
     p = hd->buf;
   #ifdef BIG_ENDIAN_HOST
@@ -574,7 +590,7 @@
 #ifndef IS_MODULE
 static
 #endif
-const char * const gnupgext_version = "RMD160 ($Revision: 1.17.2.1 $)";
+const char * const gnupgext_version = "RMD160 ($Revision: 1.17.2.4 $)";
 
 static struct {
     int class;
diff -urN gnupg-1.0.4/cipher/rndegd.c gnupg-1.0.5/cipher/rndegd.c
--- gnupg-1.0.4/cipher/rndegd.c	Fri Aug 25 16:00:14 2000
+++ gnupg-1.0.5/cipher/rndegd.c	Sat Apr 28 20:52:40 2001
@@ -1,5 +1,5 @@
 /* rndegd.c  -	interface to the EGD
- *	Copyright (C) 1999 Free Software Foundation, Inc.
+ *	Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -123,7 +123,7 @@
         bname = EGD_SOCKET_NAME;
       #endif
         if ( !bname || !*bname )
-            bname = "entropy";
+            bname = "=entropy";
 
         if ( *bname == '=' && bname[1] )
             name = make_filename( g10_opt_homedir, bname+1 , NULL );
@@ -210,7 +210,7 @@
 #ifndef IS_MODULE
 static
 #endif
-const char * const gnupgext_version = "RNDEGD ($Revision: 1.7.2.2 $)";
+const char * const gnupgext_version = "RNDEGD ($Revision: 1.7.2.4 $)";
 
 static struct {
     int class;
diff -urN gnupg-1.0.4/cipher/rndlinux.c gnupg-1.0.5/cipher/rndlinux.c
--- gnupg-1.0.4/cipher/rndlinux.c	Fri Aug 25 16:00:14 2000
+++ gnupg-1.0.5/cipher/rndlinux.c	Sat Apr 28 20:52:40 2001
@@ -1,5 +1,5 @@
 /* rndlinux.c  -  raw random number for OSes with /dev/random
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -178,7 +178,7 @@
 #ifndef IS_MODULE
 static
 #endif
-const char * const gnupgext_version = "RNDLINUX ($Revision: 1.9.2.2 $)";
+const char * const gnupgext_version = "RNDLINUX ($Revision: 1.9.2.3 $)";
 
 static struct {
     int class;
diff -urN gnupg-1.0.4/cipher/rndunix.c gnupg-1.0.5/cipher/rndunix.c
--- gnupg-1.0.4/cipher/rndunix.c	Thu Sep 14 14:20:27 2000
+++ gnupg-1.0.5/cipher/rndunix.c	Sat Apr 28 18:49:59 2001
@@ -80,6 +80,7 @@
 #endif				/* _AIX || __QNX__ */
 #ifndef __QNX__
 #include <sys/shm.h>
+#include <signal.h>
 #include <sys/signal.h>
 #endif				/* __QNX__ */
 #include <sys/stat.h>
@@ -850,7 +851,7 @@
 #ifndef IS_MODULE
 static
 #endif
-const char * const gnupgext_version = "RNDUNIX ($Revision: 1.14.2.4 $)";
+const char * const gnupgext_version = "RNDUNIX ($Revision: 1.14.2.5 $)";
 
 
 static struct {
diff -urN gnupg-1.0.4/cipher/rndw32.c gnupg-1.0.5/cipher/rndw32.c
--- gnupg-1.0.4/cipher/rndw32.c	Mon Sep 18 12:11:42 2000
+++ gnupg-1.0.5/cipher/rndw32.c	Sat Apr 28 20:52:40 2001
@@ -1,5 +1,5 @@
 /* rndw32.c  -	W32 entropy gatherer
- *	Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+ *	Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
  *	Copyright Peter Gutmann, Matt Thomlinson and Blake Coverett 1996-1999
  *
  * This file is part of GnuPG.
@@ -311,8 +311,8 @@
 #ifndef IOCTL_DISK_PERFORMANCE
 #define IOCTL_DISK_PERFORMANCE	0x00070020
 #endif
-#ifndef IOCTL_DISK_PERFORMANCE
-#define VER_PLATFORM_WIN32_WINDOWSw 1
+#ifndef VER_PLATFORM_WIN32_WINDOWS
+#define VER_PLATFORM_WIN32_WINDOWS 1
 #endif
 
 typedef struct {
@@ -915,7 +915,7 @@
 #ifndef IS_MODULE
 static
 #endif
-const char * const gnupgext_version = "RNDW32 ($Revision: 1.1.4.6 $)";
+const char * const gnupgext_version = "RNDW32 ($Revision: 1.1.4.8 $)";
 
 static struct {
     int class;
diff -urN gnupg-1.0.4/cipher/rsa.c gnupg-1.0.5/cipher/rsa.c
--- gnupg-1.0.4/cipher/rsa.c	Wed Sep 13 15:49:23 2000
+++ gnupg-1.0.5/cipher/rsa.c	Sat Apr 28 18:50:51 2001
@@ -1,6 +1,6 @@
 /* rsa.c  -  RSA function
  *	Copyright (C) 1997, 1998, 1999 by Werner Koch (dd9jn)
- *	Copyright (C) 2000 Free Software Foundation, Inc.
+ *	Copyright (C) 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/cipher/rsa.h gnupg-1.0.5/cipher/rsa.h
--- gnupg-1.0.4/cipher/rsa.h	Tue Jun 27 16:59:06 2000
+++ gnupg-1.0.5/cipher/rsa.h	Sat Apr 28 18:50:57 2001
@@ -1,6 +1,6 @@
 /* rsa.h
  *	Copyright (C) 1997,1998 by Werner Koch (dd9jn)
- *	Copyright (C) 2000 Free Software Foundation, Inc.
+ *	Copyright (C) 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/cipher/sha1.c gnupg-1.0.5/cipher/sha1.c
--- gnupg-1.0.4/cipher/sha1.c	Wed Oct  4 15:50:33 2000
+++ gnupg-1.0.5/cipher/sha1.c	Sat Apr 28 20:52:40 2001
@@ -1,5 +1,5 @@
 /* sha1.c - SHA1 hash function
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * Please see below for more legal information!
  *
@@ -49,7 +49,16 @@
     int  count;
 } SHA1_CONTEXT;
 
-
+static void
+burn_stack (int bytes)
+{
+    char buf[128];
+    
+    memset (buf, 0, sizeof buf);
+    bytes -= sizeof buf;
+    if (bytes > 0)
+        burn_stack (bytes);
+}
 
 
 void
@@ -214,6 +223,7 @@
 {
     if( hd->count == 64 ) { /* flush the buffer */
 	transform( hd, hd->buf );
+        burn_stack (88+4*sizeof(void*));
 	hd->count = 0;
 	hd->nblocks++;
     }
@@ -234,6 +244,7 @@
 	inlen -= 64;
 	inbuf += 64;
     }
+    burn_stack (88+4*sizeof(void*));
     for( ; inlen && hd->count < 64; inlen-- )
 	hd->buf[hd->count++] = *inbuf++;
 }
@@ -254,18 +265,19 @@
 
     sha1_write(hd, NULL, 0); /* flush */;
 
-    msb = 0;
     t = hd->nblocks;
-    if( (lsb = t << 6) < t ) /* multiply by 64 to make a byte count */
-	msb++;
-    msb += t >> 26;
+    /* multiply by 64 to make a byte count */
+    lsb = t << 6;
+    msb = t >> 26;
+    /* add the count */
     t = lsb;
-    if( (lsb = t + hd->count) < t ) /* add the count */
+    if( (lsb += hd->count) < t )
 	msb++;
+    /* multiply by 8 to make a bit count */
     t = lsb;
-    if( (lsb = t << 3) < t ) /* multiply by 8 to make a bit count */
-	msb++;
-    msb += t >> 29;
+    lsb <<= 3;
+    msb <<= 3;
+    msb |= t >> 29;
 
     if( hd->count < 56 ) { /* enough room */
 	hd->buf[hd->count++] = 0x80; /* pad */
@@ -289,6 +301,7 @@
     hd->buf[62] = lsb >>  8;
     hd->buf[63] = lsb	   ;
     transform( hd, hd->buf );
+    burn_stack (88+4*sizeof(void*));
 
     p = hd->buf;
   #ifdef BIG_ENDIAN_HOST
@@ -350,7 +363,7 @@
 #ifndef IS_MODULE
 static
 #endif
-const char * const gnupgext_version = "SHA1 ($Revision: 1.12.2.3 $)";
+const char * const gnupgext_version = "SHA1 ($Revision: 1.12.2.6 $)";
 
 static struct {
     int class;
diff -urN gnupg-1.0.4/cipher/smallprime.c gnupg-1.0.5/cipher/smallprime.c
--- gnupg-1.0.4/cipher/smallprime.c	Wed Dec 23 13:41:15 1998
+++ gnupg-1.0.5/cipher/smallprime.c	Sat Apr 28 18:51:37 2001
@@ -1,5 +1,5 @@
 /* smallprime.c - List of small primes
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/cipher/tiger.c gnupg-1.0.5/cipher/tiger.c
--- gnupg-1.0.4/cipher/tiger.c	Fri Jan 14 18:25:56 2000
+++ gnupg-1.0.5/cipher/tiger.c	Sat Apr 28 20:52:40 2001
@@ -1,5 +1,5 @@
 /* tiger.c  -  The TIGER hash function
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -631,6 +631,19 @@
 
 
 static void
+burn_stack (int bytes)
+{
+    char buf[256];
+    
+    memset (buf, 0, sizeof buf);
+    bytes -= sizeof buf;
+    if (bytes > 0)
+        burn_stack (bytes);
+}
+
+
+
+static void
 tiger_init( TIGER_CONTEXT *hd )
 {
     hd->a = 0x0123456789abcdefLL;
@@ -768,6 +781,7 @@
 {
     if( hd->count == 64 ) { /* flush the buffer */
 	transform( hd, hd->buf );
+        burn_stack (21*8+11*sizeof(void*));
 	hd->count = 0;
 	hd->nblocks++;
     }
@@ -788,6 +802,7 @@
 	inlen -= 64;
 	inbuf += 64;
     }
+    burn_stack (21*8+11*sizeof(void*));
     for( ; inlen && hd->count < 64; inlen-- )
 	hd->buf[hd->count++] = *inbuf++;
 }
@@ -805,18 +820,19 @@
 
     tiger_write(hd, NULL, 0); /* flush */;
 
-    msb = 0;
     t = hd->nblocks;
-    if( (lsb = t << 6) < t ) /* multiply by 64 to make a byte count */
-	msb++;
-    msb += t >> 26;
+    /* multiply by 64 to make a byte count */
+    lsb = t << 6;
+    msb = t >> 26;
+    /* add the count */
     t = lsb;
-    if( (lsb = t + hd->count) < t ) /* add the count */
+    if( (lsb += hd->count) < t )
 	msb++;
+    /* multiply by 8 to make a bit count */
     t = lsb;
-    if( (lsb = t << 3) < t ) /* multiply by 8 to make a bit count */
-	msb++;
-    msb += t >> 29;
+    lsb <<= 3;
+    msb <<= 3;
+    msb |= t >> 29;
 
     if( hd->count < 56 ) { /* enough room */
 	hd->buf[hd->count++] = 0x01; /* pad */
@@ -840,6 +856,7 @@
     hd->buf[62] = msb >> 16;
     hd->buf[63] = msb >> 24;
     transform( hd, hd->buf );
+    burn_stack (21*8+11*sizeof(void*));
 
     p = hd->buf;
   #ifdef BIG_ENDIAN_HOST
@@ -904,7 +921,7 @@
     *(void  (**)(TIGER_CONTEXT *))r_final		 = tiger_final;
     *(byte *(**)(TIGER_CONTEXT *))r_read		 = tiger_read;
 
-    return "TIGER";
+    return "TIGER192";
 }
 
 
@@ -912,7 +929,7 @@
 #ifndef IS_MODULE
 static
 #endif
-const char * const gnupgext_version = "TIGER ($Revision: 1.10.2.1 $)";
+const char * const gnupgext_version = "TIGER ($Revision: 1.10.2.5 $)";
 
 static struct {
     int class;
diff -urN gnupg-1.0.4/cipher/twofish.c gnupg-1.0.5/cipher/twofish.c
--- gnupg-1.0.4/cipher/twofish.c	Fri Apr 14 19:34:26 2000
+++ gnupg-1.0.5/cipher/twofish.c	Sat Apr 28 18:54:54 2001
@@ -545,11 +545,25 @@
    x += y; y += x; ctx->a[j] = x; \
    ctx->a[(j) + 1] = (y << 9) + (y >> 23)
 
+
+static void
+burn_stack (int bytes)
+{
+    char buf[64];
+    
+    memset (buf, 0, sizeof buf);
+    bytes -= sizeof buf;
+    if (bytes > 0)
+        burn_stack (bytes);
+}
+
+
+
 /* Perform the key setup.  Note that this works only with 128- and 256-bit
  * keys, despite the API that looks like it might support other sizes. */
 
 static int
-twofish_setkey (TWOFISH_context *ctx, const byte *key, const unsigned keylen)
+do_twofish_setkey (TWOFISH_context *ctx, const byte *key, unsigned int keylen)
 {
     int i, j, k;
 
@@ -682,6 +696,16 @@
 
     return 0;
 }
+
+static int
+twofish_setkey (TWOFISH_context *ctx, const byte *key, unsigned int keylen)
+{
+    int rc = do_twofish_setkey (ctx, key, keylen);
+    burn_stack (23+6*sizeof(void*));
+    return rc;
+}
+        
+
 
 /* Macros to compute the g() function in the encryption and decryption
  * rounds.  G1 is the straight g() function; G2 includes the 8-bit
@@ -744,7 +768,7 @@
 /* Encrypt one block.  in and out may be the same. */
 
 static void
-twofish_encrypt (const TWOFISH_context *ctx, byte *out, const byte *in)
+do_twofish_encrypt (const TWOFISH_context *ctx, byte *out, const byte *in)
 {
    /* The four 32-bit chunks of the text. */
    u32 a, b, c, d;
@@ -774,11 +798,18 @@
    OUTUNPACK (2, a, 6);
    OUTUNPACK (3, b, 7);
 }
+
+static void
+twofish_encrypt (const TWOFISH_context *ctx, byte *out, const byte *in)
+{
+    do_twofish_encrypt (ctx, out, in);
+    burn_stack (24+3*sizeof (void*));
+}
 
 /* Decrypt one block.  in and out may be the same. */
 
 static void
-twofish_decrypt (const TWOFISH_context *ctx, byte *out, const byte *in)
+do_twofish_decrypt (const TWOFISH_context *ctx, byte *out, const byte *in)
 {
    /* The four 32-bit chunks of the text. */
    u32 a, b, c, d;
@@ -808,6 +839,13 @@
    OUTUNPACK (2, c, 2);
    OUTUNPACK (3, d, 3);
 }
+
+static void
+twofish_decrypt (const TWOFISH_context *ctx, byte *out, const byte *in)
+{
+    do_twofish_decrypt (ctx, out, in);
+    burn_stack (24+3*sizeof (void*));
+}
 
 /* Test a single encryption and decryption with each key size. */
 
@@ -1004,7 +1042,9 @@
 }
 
 
-const char * const gnupgext_version = "TWOFISH ($Revision: 1.8.2.3 $)";
+#ifdef IS_MODULE
+static
+const char * const gnupgext_version = "TWOFISH ($Revision: 1.8.2.5 $)";
 
 static struct {
     int class;
@@ -1034,7 +1074,7 @@
  *		  version = interface version of the function/pointer
  *			    (currently this is 1 for all functions)
  */
-void *
+static void *
 gnupgext_enum_func ( int what, int *sequence, int *class, int *vers )
 {
     void *ret;
@@ -1062,4 +1102,4 @@
     *sequence = i;
     return ret;
 }
-
+#endif
diff -urN gnupg-1.0.4/config.h.in gnupg-1.0.5/config.h.in
--- gnupg-1.0.4/config.h.in	Wed Sep  6 17:23:46 2000
+++ gnupg-1.0.5/config.h.in	Thu Mar  8 15:26:26 2001
@@ -1,6 +1,6 @@
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
 /* acconfig.h - used by autoheader to make config.h.in
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG.
  *
@@ -188,11 +188,8 @@
 /* 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 fseeko function.  */
+#undef HAVE_FSEEKO
 
 /* Define if you have the getcwd function.  */
 #undef HAVE_GETCWD
@@ -367,6 +364,18 @@
 
 /* Version number of package */
 #undef VERSION
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define to make ftello visible on some hosts (e.g. HP-UX 10.20). */
+#undef _LARGEFILE_SOURCE
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Define to make ftello visible on some hosts (e.g. glibc 2.1.3). */
+#undef _XOPEN_SOURCE
 
 /* define if compiled symbols have a leading underscore */
 #undef WITH_SYMBOL_UNDERSCORE
diff -urN gnupg-1.0.4/configure gnupg-1.0.5/configure
--- gnupg-1.0.4/configure	Tue Oct 17 15:39:41 2000
+++ gnupg-1.0.5/configure	Sun Apr 29 16:38:16 2001
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.103.2.27 
+# From configure.in Revision: 1.103.2.33 
 CDPATH=
 
 
@@ -17,6 +17,7 @@
 
 
 
+       
 
        
 
@@ -53,7 +54,6 @@
 
 
 
-
 # GNUPG_PROG_NM - find the path to a BSD-compatible name lister
 
 
@@ -70,6 +70,17 @@
 
 
 
+ 
+#serial 12
+
+
+
+
+
+
+
+
+
 
 # Define a conditional.
 
@@ -163,8 +174,6 @@
 ac_help="$ac_help
   --disable-asm           do not use assembler modules"
 ac_help="$ac_help
-  --enable-m-debug        enable debugging of memory allocation"
-ac_help="$ac_help
   --enable-m-guard        enable memory guard facility"
 ac_help="$ac_help
   --with-included-zlib    use the zlib code included here"
@@ -174,6 +183,8 @@
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
 ac_help="$ac_help
+  --disable-largefile     omit support for large files"
+ac_help="$ac_help
   --disable-nls           do not use Native Language Support"
 ac_help="$ac_help
   --with-included-gettext use the GNU gettext library included here"
@@ -739,7 +750,7 @@
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:743: checking host system type" >&5
+echo "configure:754: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -760,7 +771,7 @@
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:764: checking target system type" >&5
+echo "configure:775: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -778,7 +789,7 @@
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:782: checking build system type" >&5
+echo "configure:793: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -812,7 +823,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:816: checking for a BSD compatible install" >&5
+echo "configure:827: 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
@@ -865,7 +876,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:869: checking whether build environment is sane" >&5
+echo "configure:880: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -922,7 +933,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:926: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:937: 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
@@ -968,7 +979,7 @@
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:972: checking for working aclocal" >&5
+echo "configure:983: 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.
@@ -981,7 +992,7 @@
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:985: checking for working autoconf" >&5
+echo "configure:996: 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.
@@ -994,7 +1005,7 @@
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:998: checking for working automake" >&5
+echo "configure:1009: 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.
@@ -1007,7 +1018,7 @@
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1011: checking for working autoheader" >&5
+echo "configure:1022: 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.
@@ -1020,7 +1031,7 @@
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1024: checking for working makeinfo" >&5
+echo "configure:1035: 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.
@@ -1035,7 +1046,7 @@
 
 
 
-ALL_LINGUAS="da de eo es_ES fr id it ja nl pl pt_BR pt_PT ru sv"
+ALL_LINGUAS="da de eo es_ES et fr id it ja nl pl pt_BR pt_PT ru sv tr"
 static_modules="sha1 md5 rmd160"
 static_random_module=""
 
@@ -1044,7 +1055,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:1048: checking for $ac_word" >&5
+echo "configure:1059: 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
@@ -1079,7 +1090,7 @@
 
 
 echo $ac_n "checking which static random module to use""... $ac_c" 1>&6
-echo "configure:1083: checking which static random module to use" >&5
+echo "configure:1094: 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"
@@ -1119,7 +1130,7 @@
 
 
 echo $ac_n "checking whether use of /dev/random is requested""... $ac_c" 1>&6
-echo "configure:1123: checking whether use of /dev/random is requested" >&5
+echo "configure:1134: 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"
@@ -1133,7 +1144,7 @@
 
 
 echo $ac_n "checking whether use of extensions is requested""... $ac_c" 1>&6
-echo "configure:1137: checking whether use of extensions is requested" >&5
+echo "configure:1148: 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"
@@ -1145,7 +1156,7 @@
 echo "$ac_t""$try_dynload" 1>&6
 
 echo $ac_n "checking whether assembler modules are requested""... $ac_c" 1>&6
-echo "configure:1149: checking whether assembler modules are requested" >&5
+echo "configure:1160: 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"
@@ -1156,27 +1167,9 @@
 
 echo "$ac_t""$try_asm_modules" 1>&6
 
-echo $ac_n "checking whether memory debugging is requested""... $ac_c" 1>&6
-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"
-  use_m_debug=$enableval
-else
-  use_m_debug=no
-fi
-
-echo "$ac_t""$use_m_debug" 1>&6
-if test "$use_m_debug" = yes; then
-    cat >> confdefs.h <<\EOF
-#define M_DEBUG 1
-EOF
-
-    use_m_guard=yes
-else
-    echo $ac_n "checking whether memory guard is requested""... $ac_c" 1>&6
-echo "configure:1179: checking whether memory guard is requested" >&5
-    # Check whether --enable-m-guard or --disable-m-guard was given.
+echo $ac_n "checking whether memory guard is requested""... $ac_c" 1>&6
+echo "configure:1172: 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"
   use_m_guard=$enableval
@@ -1184,8 +1177,7 @@
   use_m_guard=no
 fi
 
-    echo "$ac_t""$use_m_guard" 1>&6
-fi
+echo "$ac_t""$use_m_guard" 1>&6
 if test "$use_m_guard" = yes ; then
     cat >> confdefs.h <<\EOF
 #define M_GUARD 1
@@ -1195,7 +1187,7 @@
 
 
 echo $ac_n "checking whether included zlib is requested""... $ac_c" 1>&6
-echo "configure:1199: checking whether included zlib is requested" >&5
+echo "configure:1191: 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"
@@ -1208,7 +1200,7 @@
 
 
 echo $ac_n "checking whether use of capabilities is requested""... $ac_c" 1>&6
-echo "configure:1212: checking whether use of capabilities is requested" >&5
+echo "configure:1204: 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"
@@ -1224,7 +1216,7 @@
 
 
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1228: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1220: 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"
@@ -1250,12 +1242,6 @@
 
 case "${target}" in
     *-*-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?
-        CC="${target}-gcc"
-        CPP="${target}-gcc -E"
-        RANLIB="${target}-ranlib"
         disallowed_modules="rndunix rndlinux rndegd"
         ;;
     *)
@@ -1283,7 +1269,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:1287: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1273: 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
@@ -1310,7 +1296,7 @@
 fi
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:1314: checking whether build environment is sane" >&5
+echo "configure:1300: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -1349,7 +1335,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:1353: checking for working aclocal" >&5
+echo "configure:1339: 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.
@@ -1362,7 +1348,7 @@
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1366: checking for working autoconf" >&5
+echo "configure:1352: 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.
@@ -1375,7 +1361,7 @@
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:1379: checking for working automake" >&5
+echo "configure:1365: 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.
@@ -1388,7 +1374,7 @@
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1392: checking for working autoheader" >&5
+echo "configure:1378: 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.
@@ -1400,10 +1386,23 @@
    echo "$ac_t""missing" 1>&6
 fi
 
+echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
+echo "configure:1391: 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.
+if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
+   MAKEINFO=makeinfo
+   echo "$ac_t""found" 1>&6
+else
+   MAKEINFO="$missing_dir/missing makeinfo"
+   echo "$ac_t""missing" 1>&6
+fi
+
 # 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:1407: checking for $ac_word" >&5
+echo "configure:1406: 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
@@ -1433,7 +1432,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:1437: checking for $ac_word" >&5
+echo "configure:1436: 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
@@ -1484,7 +1483,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:1488: checking for $ac_word" >&5
+echo "configure:1487: 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
@@ -1516,7 +1515,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1520: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1519: 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.
@@ -1527,12 +1526,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1531 "configure"
+#line 1530 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1535: \"$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
@@ -1558,12 +1557,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:1562: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1561: 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:1567: checking whether we are using GNU C" >&5
+echo "configure:1566: 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
@@ -1572,7 +1571,7 @@
   yes;
 #endif
 EOF
-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
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1575: \"$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
@@ -1591,7 +1590,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1595: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1594: 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
@@ -1623,7 +1622,7 @@
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1627: checking how to run the C preprocessor" >&5
+echo "configure:1626: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1638,13 +1637,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1642 "configure"
+#line 1641 "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:1648: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1647: \"$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
   :
@@ -1655,13 +1654,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1659 "configure"
+#line 1658 "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:1665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1664: \"$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
   :
@@ -1672,13 +1671,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1676 "configure"
+#line 1675 "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:1682: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1681: \"$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
   :
@@ -1703,7 +1702,7 @@
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1707: checking for POSIXized ISC" >&5
+echo "configure:1706: 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
@@ -1723,6 +1722,296 @@
   ISC=
 fi
 
+# Check whether --enable-largefile or --disable-largefile was given.
+if test "${enable_largefile+set}" = set; then
+  enableval="$enable_largefile"
+  :
+fi
+
+   if test "$enable_largefile" != no; then
+
+     echo $ac_n "checking for special C compiler options needed for large files""... $ac_c" 1>&6
+echo "configure:1735: checking for special C compiler options needed for large files" >&5
+if eval "test \"`echo '$''{'ac_cv_sys_largefile_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_cv_sys_largefile_CC=no
+        if test "$GCC" != yes; then
+         # IRIX 6.2 and later do not support large files by default,
+         # so use the C compiler's -n32 option if that helps.
+         cat > conftest.$ac_ext <<EOF
+#line 1744 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+    int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];
+  
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:1753: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_save_CC="$CC"
+            CC="$CC -n32"
+            cat > conftest.$ac_ext <<EOF
+#line 1762 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+    int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];
+  
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:1771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_sys_largefile_CC=' -n32'
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+            CC="$ac_save_CC"
+fi
+rm -f conftest*
+        fi
+fi
+
+echo "$ac_t""$ac_cv_sys_largefile_CC" 1>&6
+     if test "$ac_cv_sys_largefile_CC" != no; then
+       CC="$CC$ac_cv_sys_largefile_CC"
+     fi
+
+     echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6
+echo "configure:1791: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+if eval "test \"`echo '$''{'ac_cv_sys_file_offset_bits'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_cv_sys_file_offset_bits=no
+      cat > conftest.$ac_ext <<EOF
+#line 1797 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+    int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];
+  
+
+        
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:1808: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat > conftest.$ac_ext <<EOF
+#line 1815 "configure"
+#include "confdefs.h"
+#define _FILE_OFFSET_BITS 64
+#include <sys/types.h>
+    int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];
+  
+
+          
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:1827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_sys_file_offset_bits=64
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_sys_file_offset_bits" 1>&6
+   if test "$ac_cv_sys_file_offset_bits" != no; then
+     cat >> confdefs.h <<EOF
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+EOF
+
+   fi
+     echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6
+echo "configure:1847: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+if eval "test \"`echo '$''{'ac_cv_sys_largefile_source'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_cv_sys_largefile_source=no
+      cat > conftest.$ac_ext <<EOF
+#line 1853 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+    int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];
+  
+#include <stdio.h>
+        
+int main() {
+return !ftello;
+; return 0; }
+EOF
+if { (eval echo configure:1864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat > conftest.$ac_ext <<EOF
+#line 1871 "configure"
+#include "confdefs.h"
+#define _LARGEFILE_SOURCE 1
+#include <sys/types.h>
+    int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];
+  
+#include <stdio.h>
+          
+int main() {
+return !ftello;
+; return 0; }
+EOF
+if { (eval echo configure:1883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_sys_largefile_source=1
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_sys_largefile_source" 1>&6
+   if test "$ac_cv_sys_largefile_source" != no; then
+     cat >> confdefs.h <<EOF
+#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
+EOF
+
+   fi
+     echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6
+echo "configure:1903: checking for _LARGE_FILES value needed for large files" >&5
+if eval "test \"`echo '$''{'ac_cv_sys_large_files'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_cv_sys_large_files=no
+      cat > conftest.$ac_ext <<EOF
+#line 1909 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+    int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];
+  
+
+        
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:1920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat > conftest.$ac_ext <<EOF
+#line 1927 "configure"
+#include "confdefs.h"
+#define _LARGE_FILES 1
+#include <sys/types.h>
+    int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];
+  
+
+          
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:1939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_sys_large_files=1
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_sys_large_files" 1>&6
+   if test "$ac_cv_sys_large_files" != no; then
+     cat >> confdefs.h <<EOF
+#define _LARGE_FILES $ac_cv_sys_large_files
+EOF
+
+   fi
+     echo $ac_n "checking for _XOPEN_SOURCE value needed for large files""... $ac_c" 1>&6
+echo "configure:1959: checking for _XOPEN_SOURCE value needed for large files" >&5
+if eval "test \"`echo '$''{'ac_cv_sys_xopen_source'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_cv_sys_xopen_source=no
+      cat > conftest.$ac_ext <<EOF
+#line 1965 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+    int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];
+  
+#include <stdio.h>
+        
+int main() {
+return !ftello;
+; return 0; }
+EOF
+if { (eval echo configure:1976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat > conftest.$ac_ext <<EOF
+#line 1983 "configure"
+#include "confdefs.h"
+#define _XOPEN_SOURCE 500
+#include <sys/types.h>
+    int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];
+  
+#include <stdio.h>
+          
+int main() {
+return !ftello;
+; return 0; }
+EOF
+if { (eval echo configure:1995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_sys_xopen_source=500
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_sys_xopen_source" 1>&6
+   if test "$ac_cv_sys_xopen_source" != no; then
+     cat >> confdefs.h <<EOF
+#define _XOPEN_SOURCE $ac_cv_sys_xopen_source
+EOF
+
+   fi
+   fi
+  
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -1735,7 +2024,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:1739: checking for a BSD compatible install" >&5
+echo "configure:2028: 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
@@ -1792,7 +2081,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:1796: checking for $ac_word" >&5
+echo "configure:2085: 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
@@ -1824,7 +2113,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:1828: checking for $ac_word" >&5
+echo "configure:2117: 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
@@ -1861,7 +2150,7 @@
   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
+echo "configure:2154: 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"
@@ -1881,24 +2170,63 @@
   WORKING_FAQPROG_FALSE=
 fi
 
-    if test $working_faqprog = no; then
-	echo "configure: warning: 
-***
-*** It seems that the faqprog.pl program is not installed;
-*** however it is only needed if you want to change the FAQ.
-***  (faqprog.pl should be available at:
-***    ftp://ftp.gnupg.org/pub/gcrypt/contrib/faqprog.pl )
-*** No need to worry about this warning.
-***" 1>&2
+   
+
+    # Extract the first word of "docbook2texi", so it can be a program name with args.
+set dummy docbook2texi; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2179: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_DOCBOOK_TO_TEXI'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$DOCBOOK_TO_TEXI"; then
+  ac_cv_prog_DOCBOOK_TO_TEXI="$DOCBOOK_TO_TEXI" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_DOCBOOK_TO_TEXI="yes"
+      break
     fi
-  
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_DOCBOOK_TO_TEXI" && ac_cv_prog_DOCBOOK_TO_TEXI="no"
+fi
+fi
+DOCBOOK_TO_TEXI="$ac_cv_prog_DOCBOOK_TO_TEXI"
+if test -n "$DOCBOOK_TO_TEXI"; then
+  echo "$ac_t""$DOCBOOK_TO_TEXI" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    echo $ac_n "checking for sgml to texi tools""... $ac_c" 1>&6
+echo "configure:2207: checking for sgml to texi tools" >&5
+    working_sgmltotexi=no
+    if test "$ac_cv_prog_DOCBOOK_TO_TEXI" = yes; then
+      if sgml2xml -v /dev/null 2>&1 | grep 'SP version' >/dev/null 2>&1 ; then
+            working_sgmltotexi=yes
+      fi
+    fi
+    echo "$ac_t""$working_sgmltotexi" 1>&6
+    
+
+if test "$working_sgmltotexi" = "yes" ; then
+  HAVE_DOCBOOK_TO_TEXI_TRUE=
+  HAVE_DOCBOOK_TO_TEXI_FALSE='#'
+else
+  HAVE_DOCBOOK_TO_TEXI_TRUE='#'
+  HAVE_DOCBOOK_TO_TEXI_FALSE=
+fi
+   
 
 MPI_OPT_FLAGS=""
 
 
 try_gettext=yes
 try_gdbm=yes
-try_large_file=yes
 case "${target}" in
     *-*-mingw32*)
         # special stuff for Windoze NT
@@ -1962,7 +2290,6 @@
         if test -z "$GCC" ; then
             CFLAGS="$CFLAGS -Ae -D_HPUX_SOURCE"
         fi
-        try_large_file="no"
         ;;
     *-dec-osf4*)
         if test -z "$GCC" ; then
@@ -1973,16 +2300,13 @@
         ;;
     m68k-atari-mint)
         ;;
-    *-solaris*)
-        try_large_file="no"
-        ;;
     *)
        ;;
 esac
 
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1986: checking for BSD-compatible nm" >&5
+echo "configure:2310: 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
@@ -2018,7 +2342,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:2022: checking command to parse $NM output" >&5
+echo "configure:2346: 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
@@ -2081,10 +2405,10 @@
 #endif
 int main(){nm_test_var='a';nm_test_func;return 0;}
 EOF
-if { (eval echo configure:2085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   # Now try to grab the symbols.
   ac_nlist=conftest.nm
-  if { (eval echo configure:2088: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then
+  if { (eval echo configure:2412: \"$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
@@ -2142,7 +2466,7 @@
         ac_save_CFLAGS="$CFLAGS"
         LIBS="conftestm.$ac_objext"
         CFLAGS="$CFLAGS$no_builtin_flag"
-        if { (eval echo configure:2146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+        if { (eval echo configure:2470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
           ac_pipe_works=yes
         else
           echo "configure: failed program was:" >&5
@@ -2193,7 +2517,7 @@
 
 if test "$tmp_do_check" = "yes"; then
 echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6
-echo "configure:2197: checking for _ prefix in compiled symbols" >&5
+echo "configure:2521: 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
@@ -2202,10 +2526,10 @@
 void nm_test_func(){}
 int main(){nm_test_func;return 0;}
 EOF
-if { (eval echo configure:2206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   # Now try to grab the symbols.
   ac_nlist=conftest.nm
-  if { (eval echo configure:2209: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then
+  if { (eval echo configure:2533: \"$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
@@ -2229,7 +2553,7 @@
 
 else
 echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6
-echo "configure:2233: checking for _ prefix in compiled symbols" >&5
+echo "configure:2557: 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
@@ -2240,7 +2564,7 @@
 fi
 
  echo $ac_n "checking for option to create PIC""... $ac_c" 1>&6
-echo "configure:2244: checking for option to create PIC" >&5
+echo "configure:2568: checking for option to create PIC" >&5
     CFLAGS_PIC=
     NO_PIC=no
     if test "$cross_compiling" = yes; then
@@ -2305,7 +2629,7 @@
     fi
   
  echo $ac_n "checking how to specify -export-dynamic""... $ac_c" 1>&6
-echo "configure:2309: checking how to specify -export-dynamic" >&5
+echo "configure:2633: checking how to specify -export-dynamic" >&5
     if test "$cross_compiling" = yes; then
       echo "$ac_t""assume none" 1>&6
       CFLAGS_EXPORTDYNAMIC=""
@@ -2315,7 +2639,7 @@
 else
   
       if { ac_try='${CC-cc} $CFLAGS -Wl,--version 2>&1 |
-                                          grep "GNU ld" >/dev/null'; { (eval echo configure:2319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+                                          grep "GNU ld" >/dev/null'; { (eval echo configure:2643: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
           # using gnu's linker
           gnupg_cv_export_dynamic="-Wl,-export-dynamic"
       else
@@ -2418,7 +2742,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:2422: checking for $ac_word" >&5
+echo "configure:2746: 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
@@ -2446,12 +2770,12 @@
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2450: checking for ANSI C header files" >&5
+echo "configure:2774: 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 2455 "configure"
+#line 2779 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2459,7 +2783,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2787: \"$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*
@@ -2476,7 +2800,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 2480 "configure"
+#line 2804 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -2494,7 +2818,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 2498 "configure"
+#line 2822 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -2515,7 +2839,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 2519 "configure"
+#line 2843 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2526,7 +2850,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:2530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -2550,18 +2874,18 @@
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2554: checking for working const" >&5
+echo "configure:2878: 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 2559 "configure"
+#line 2883 "configure"
 #include "confdefs.h"
 
 int main() {
 
 /* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x = {0,0};
+typedef int charset[2]; const charset x;
 /* SunOS 4.1.1 cc rejects this.  */
 char const *const *ccp;
 char **p;
@@ -2604,7 +2928,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2608: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -2625,21 +2949,21 @@
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2629: checking for inline" >&5
+echo "configure:2953: 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 2636 "configure"
+#line 2960 "configure"
 #include "confdefs.h"
 
 int main() {
-} int $ac_kw foo() {
+} $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:2643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -2665,12 +2989,12 @@
 esac
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:2669: checking for off_t" >&5
+echo "configure:2993: 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 2674 "configure"
+#line 2998 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2698,12 +3022,12 @@
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2702: checking for size_t" >&5
+echo "configure:3026: 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 2707 "configure"
+#line 3031 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2733,19 +3057,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:2737: checking for working alloca.h" >&5
+echo "configure:3061: 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 2742 "configure"
+#line 3066 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
-void *p = alloca(2 * sizeof(int));
+char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:2749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3073: \"$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
@@ -2766,12 +3090,12 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:2770: checking for alloca" >&5
+echo "configure:3094: 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 2775 "configure"
+#line 3099 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -2799,7 +3123,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:2803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3127: \"$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
@@ -2831,12 +3155,12 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:2835: checking whether alloca needs Cray hooks" >&5
+echo "configure:3159: 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 2840 "configure"
+#line 3164 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -2861,12 +3185,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:2865: checking for $ac_func" >&5
+echo "configure:3189: 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 2870 "configure"
+#line 3194 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2889,7 +3213,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3217: \"$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
@@ -2916,7 +3240,7 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:2920: checking stack direction for C alloca" >&5
+echo "configure:3244: 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
@@ -2924,7 +3248,7 @@
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 2928 "configure"
+#line 3252 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -2943,7 +3267,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:2947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3271: \"$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
@@ -2968,17 +3292,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2972: checking for $ac_hdr" >&5
+echo "configure:3296: 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 2977 "configure"
+#line 3301 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3306: \"$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*
@@ -3007,12 +3331,12 @@
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3011: checking for $ac_func" >&5
+echo "configure:3335: 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 3016 "configure"
+#line 3340 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3035,7 +3359,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3363: \"$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
@@ -3060,7 +3384,7 @@
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:3064: checking for working mmap" >&5
+echo "configure:3388: 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
@@ -3068,7 +3392,7 @@
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 3072 "configure"
+#line 3396 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -3095,15 +3419,12 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <sys/mman.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 
 /* This mess was copied from the GNU getpagesize.h.  */
 #ifndef HAVE_GETPAGESIZE
+# ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+# endif
 
 /* Assume that all systems that can run configure have sys/param.h.  */
 # ifndef HAVE_SYS_PARAM_H
@@ -3158,7 +3479,7 @@
 	/*
 	 * First, make a file with some known garbage in it.
 	 */
-	data = (char*)malloc(pagesize);
+	data = malloc(pagesize);
 	if (!data)
 		exit(1);
 	for (i = 0; i < pagesize; ++i)
@@ -3179,7 +3500,7 @@
 	fd = open("conftestmmap", O_RDWR);
 	if (fd < 0)
 		exit(1);
-	data2 = (char*)malloc(2 * pagesize);
+	data2 = malloc(2 * pagesize);
 	if (!data2)
 		exit(1);
 	data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1);
@@ -3197,7 +3518,7 @@
 	 */
 	for (i = 0; i < pagesize; ++i)
 		*(data2 + i) = *(data2 + i) + 1;
-	data3 = (char*)malloc(pagesize);
+	data3 = malloc(pagesize);
 	if (!data3)
 		exit(1);
 	if (read(fd, data3, pagesize) != pagesize)
@@ -3211,7 +3532,7 @@
 }
 
 EOF
-if { (eval echo configure:3215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3536: \"$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
@@ -3239,17 +3560,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3243: checking for $ac_hdr" >&5
+echo "configure:3564: 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 3248 "configure"
+#line 3569 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3574: \"$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*
@@ -3279,12 +3600,12 @@
 strdup __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3283: checking for $ac_func" >&5
+echo "configure:3604: 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 3288 "configure"
+#line 3609 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3307,7 +3628,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3632: \"$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
@@ -3336,12 +3657,12 @@
      for ac_func in stpcpy
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3340: checking for $ac_func" >&5
+echo "configure:3661: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3345 "configure"
+#line 3666 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3364,7 +3685,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3398,19 +3719,19 @@
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:3402: checking for LC_MESSAGES" >&5
+echo "configure:3723: 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 3407 "configure"
+#line 3728 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:3414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3735: \"$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
@@ -3431,7 +3752,7 @@
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:3435: checking whether NLS is requested" >&5
+echo "configure:3756: 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"
@@ -3451,7 +3772,7 @@
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:3455: checking whether included gettext is requested" >&5
+echo "configure:3776: 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"
@@ -3470,17 +3791,17 @@
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:3474: checking for libintl.h" >&5
+echo "configure:3795: 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 3479 "configure"
+#line 3800 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3484: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3805: \"$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*
@@ -3497,19 +3818,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:3501: checking for gettext in libc" >&5
+echo "configure:3822: 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 3506 "configure"
+#line 3827 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:3513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3834: \"$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
@@ -3525,7 +3846,7 @@
 
 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:3529: checking for bindtextdomain in -lintl" >&5
+echo "configure:3850: 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
@@ -3533,7 +3854,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3537 "configure"
+#line 3858 "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
@@ -3544,7 +3865,7 @@
 bindtextdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:3548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3869: \"$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
@@ -3560,12 +3881,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:3564: checking for gettext in libintl" >&5
+echo "configure:3885: 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:3569: checking for gettext in -lintl" >&5
+echo "configure:3890: 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
@@ -3573,7 +3894,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3577 "configure"
+#line 3898 "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
@@ -3584,7 +3905,7 @@
 gettext()
 ; return 0; }
 EOF
-if { (eval echo configure:3588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3909: \"$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
@@ -3623,7 +3944,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:3627: checking for $ac_word" >&5
+echo "configure:3948: 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
@@ -3657,12 +3978,12 @@
 		for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3661: checking for $ac_func" >&5
+echo "configure:3982: 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 3666 "configure"
+#line 3987 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3685,7 +4006,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4010: \"$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
@@ -3712,7 +4033,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:3716: checking for $ac_word" >&5
+echo "configure:4037: 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
@@ -3748,7 +4069,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:3752: checking for $ac_word" >&5
+echo "configure:4073: 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
@@ -3780,7 +4101,7 @@
 fi
 
 		cat > conftest.$ac_ext <<EOF
-#line 3784 "configure"
+#line 4105 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -3788,7 +4109,7 @@
 			       return _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:3792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   CATOBJEXT=.gmo
 		   DATADIRNAME=share
@@ -3811,7 +4132,7 @@
 
         if test "$CATOBJEXT" = "NONE"; then
 	  echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
-echo "configure:3815: checking whether catgets can be used" >&5
+echo "configure:4136: 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"
@@ -3824,7 +4145,7 @@
 
 	  if test "$nls_cv_use_catgets" = "yes"; then
 	    	    echo $ac_n "checking for main in -li""... $ac_c" 1>&6
-echo "configure:3828: checking for main in -li" >&5
+echo "configure:4149: 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
@@ -3832,14 +4153,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-li  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3836 "configure"
+#line 4157 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:3843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4164: \"$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
@@ -3867,12 +4188,12 @@
 fi
 
 	    echo $ac_n "checking for catgets""... $ac_c" 1>&6
-echo "configure:3871: checking for catgets" >&5
+echo "configure:4192: 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 3876 "configure"
+#line 4197 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char catgets(); below.  */
@@ -3895,7 +4216,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4220: \"$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
@@ -3917,7 +4238,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:3921: checking for $ac_word" >&5
+echo "configure:4242: 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
@@ -3953,7 +4274,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:3957: checking for $ac_word" >&5
+echo "configure:4278: 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
@@ -3990,7 +4311,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:3994: checking for $ac_word" >&5
+echo "configure:4315: 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
@@ -4025,7 +4346,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:4029: checking for $ac_word" >&5
+echo "configure:4350: 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
@@ -4083,7 +4404,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:4087: checking for $ac_word" >&5
+echo "configure:4408: 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
@@ -4117,7 +4438,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:4121: checking for $ac_word" >&5
+echo "configure:4442: 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
@@ -4153,7 +4474,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:4157: checking for $ac_word" >&5
+echo "configure:4478: 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
@@ -4246,7 +4567,7 @@
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:4250: checking for catalogs to be installed" >&5
+echo "configure:4571: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for lang in ${LINGUAS=$ALL_LINGUAS}; do
          case "$ALL_LINGUAS" in
@@ -4274,17 +4595,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:4278: checking for linux/version.h" >&5
+echo "configure:4599: 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 4283 "configure"
+#line 4604 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4288: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4609: \"$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*
@@ -4360,17 +4681,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4364: checking for $ac_hdr" >&5
+echo "configure:4685: 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 4369 "configure"
+#line 4690 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4374: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4695: \"$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*
@@ -4398,7 +4719,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:4402: checking for gdbm_firstkey in -lgdbm" >&5
+echo "configure:4723: 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
@@ -4406,7 +4727,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgdbm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4410 "configure"
+#line 4731 "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
@@ -4417,7 +4738,7 @@
 gdbm_firstkey()
 ; return 0; }
 EOF
-if { (eval echo configure:4421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4742: \"$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
@@ -4447,9 +4768,13 @@
 fi
 fi
 
-
-echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:4453: checking for gethostbyname in -lnsl" >&5
+case "${target}" in
+   i386-univel-sysv4*)
+        LIBS="$LIBS -lsocket -lnsl"
+        ;;
+   *)
+      echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+echo "configure:4778: 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
@@ -4457,7 +4782,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4461 "configure"
+#line 4786 "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
@@ -4468,7 +4793,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:4472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4797: \"$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
@@ -4495,8 +4820,8 @@
   echo "$ac_t""no" 1>&6
 fi
 
-echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:4500: checking for socket in -lsocket" >&5
+      echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
+echo "configure:4825: 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
@@ -4504,7 +4829,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4508 "configure"
+#line 4833 "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
@@ -4515,7 +4840,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:4519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4844: \"$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
@@ -4536,12 +4861,12 @@
 ac_try_nsl=1
 fi
 
-if test x$ac_need_libsocket = x1; then
-    LIBS="$LIBS -lsocket"
-fi
-if test x$ac_try_nsl = x1; then
-    echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:4545: checking for gethostbyname in -lnsl" >&5
+      if test x$ac_need_libsocket = x1; then
+          LIBS="$LIBS -lsocket"
+      fi
+      if test x$ac_try_nsl = x1; then
+         echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+echo "configure:4870: 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
@@ -4549,7 +4874,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4553 "configure"
+#line 4878 "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
@@ -4560,7 +4885,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:4564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4889: \"$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
@@ -4580,16 +4905,18 @@
   echo "$ac_t""no" 1>&6
 fi
 
-    if test x$ac_need_libnsl = x1
-    then
-        LIBS="$LIBS -lnsl"
-    fi
-fi
+         if test x$ac_need_libnsl = x1
+         then
+            LIBS="$LIBS -lnsl"
+         fi
+      fi
+      ;;
+esac
 
 
 if test "$try_dynload" = yes ; then
   echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:4593: checking for dlopen in -ldl" >&5
+echo "configure:4920: 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
@@ -4597,7 +4924,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4601 "configure"
+#line 4928 "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
@@ -4608,7 +4935,7 @@
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:4612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4939: \"$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
@@ -4650,12 +4977,12 @@
     for ac_func in dlopen
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4654: checking for $ac_func" >&5
+echo "configure:4981: 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 4659 "configure"
+#line 4986 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4678,7 +5005,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5009: \"$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
@@ -4715,7 +5042,7 @@
       use_gnupg_extensions=yes
     else
       echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:4719: checking for shl_load in -ldld" >&5
+echo "configure:5046: 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
@@ -4723,7 +5050,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4727 "configure"
+#line 5054 "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
@@ -4734,7 +5061,7 @@
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:4738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5065: \"$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
@@ -4777,7 +5104,7 @@
   fi
 else
   echo $ac_n "checking for dynamic loading""... $ac_c" 1>&6
-echo "configure:4781: checking for dynamic loading" >&5
+echo "configure:5108: checking for dynamic loading" >&5
   DYNLINK_LDFLAGS=
   DYNLINK_MOD_CFLAGS=
   use_gnupg_extensions=no
@@ -4798,12 +5125,12 @@
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:4802: checking for ANSI C header files" >&5
+echo "configure:5129: 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 4807 "configure"
+#line 5134 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4811,7 +5138,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5142: \"$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*
@@ -4828,7 +5155,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 4832 "configure"
+#line 5159 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -4846,7 +5173,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 4850 "configure"
+#line 5177 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -4867,7 +5194,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 4871 "configure"
+#line 5198 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -4878,7 +5205,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:4882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -4905,17 +5232,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4909: checking for $ac_hdr" >&5
+echo "configure:5236: 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 4914 "configure"
+#line 5241 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5246: \"$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*
@@ -4944,18 +5271,18 @@
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:4948: checking for working const" >&5
+echo "configure:5275: 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 4953 "configure"
+#line 5280 "configure"
 #include "confdefs.h"
 
 int main() {
 
 /* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x = {0,0};
+typedef int charset[2]; const charset x;
 /* SunOS 4.1.1 cc rejects this.  */
 char const *const *ccp;
 char **p;
@@ -4998,7 +5325,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5329: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -5019,21 +5346,21 @@
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:5023: checking for inline" >&5
+echo "configure:5350: 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 5030 "configure"
+#line 5357 "configure"
 #include "confdefs.h"
 
 int main() {
-} int $ac_kw foo() {
+} $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:5037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -5059,12 +5386,12 @@
 esac
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:5063: checking for size_t" >&5
+echo "configure:5390: 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 5068 "configure"
+#line 5395 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -5092,12 +5419,12 @@
 fi
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:5096: checking return type of signal handlers" >&5
+echo "configure:5423: 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 5101 "configure"
+#line 5428 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -5114,7 +5441,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:5118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -5133,12 +5460,12 @@
 
 
 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:5137: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "configure:5464: 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 5142 "configure"
+#line 5469 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -5150,7 +5477,7 @@
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:5154: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_decl_sys_siglist=yes
 else
@@ -5175,14 +5502,14 @@
         echo "configure: warning: cross compiling; assuming little endianess" 1>&2
     fi
     echo $ac_n "checking endianess""... $ac_c" 1>&6
-echo "configure:5179: checking endianess" >&5
+echo "configure:5506: 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 5186 "configure"
+#line 5513 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
         #include <sys/param.h>
@@ -5193,11 +5520,11 @@
         #endif
 ; return 0; }
 EOF
-if { (eval echo configure:5197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5524: \"$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 5201 "configure"
+#line 5528 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
         #include <sys/param.h>
@@ -5208,7 +5535,7 @@
         #endif
 ; return 0; }
 EOF
-if { (eval echo configure:5212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gnupg_cv_c_endian=big
 else
@@ -5229,7 +5556,7 @@
             
 else
   cat > conftest.$ac_ext <<EOF
-#line 5233 "configure"
+#line 5560 "configure"
 #include "confdefs.h"
 main () {
               /* Are we little or big endian?  From Harbison&Steele.  */
@@ -5242,7 +5569,7 @@
               exit (u.c[sizeof (long) - 1] == 1);
               }
 EOF
-if { (eval echo configure:5246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5573: \"$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
@@ -5274,14 +5601,15 @@
 
 
  echo $ac_n "checking for byte typedef""... $ac_c" 1>&6
-echo "configure:5278: checking for byte typedef" >&5
+echo "configure:5605: 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 5283 "configure"
+#line 5610 "configure"
 #include "confdefs.h"
-#include <stdlib.h>
+#define _GNU_SOURCE 1
+    #include <stdlib.h>
     #include <sys/types.h>
 int main() {
 
@@ -5290,7 +5618,7 @@
     
 ; return 0; }
 EOF
-if { (eval echo configure:5294: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gnupg_cv_typedef_byte=yes
 else
@@ -5311,14 +5639,15 @@
     fi
   
  echo $ac_n "checking for ushort typedef""... $ac_c" 1>&6
-echo "configure:5315: checking for ushort typedef" >&5
+echo "configure:5643: 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 5320 "configure"
+#line 5648 "configure"
 #include "confdefs.h"
-#include <stdlib.h>
+#define _GNU_SOURCE 1
+    #include <stdlib.h>
     #include <sys/types.h>
 int main() {
 
@@ -5327,7 +5656,7 @@
     
 ; return 0; }
 EOF
-if { (eval echo configure:5331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gnupg_cv_typedef_ushort=yes
 else
@@ -5348,14 +5677,15 @@
     fi
   
  echo $ac_n "checking for ulong typedef""... $ac_c" 1>&6
-echo "configure:5352: checking for ulong typedef" >&5
+echo "configure:5681: 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 5357 "configure"
+#line 5686 "configure"
 #include "confdefs.h"
-#include <stdlib.h>
+#define _GNU_SOURCE 1
+    #include <stdlib.h>
     #include <sys/types.h>
 int main() {
 
@@ -5364,7 +5694,7 @@
     
 ; return 0; }
 EOF
-if { (eval echo configure:5368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gnupg_cv_typedef_ulong=yes
 else
@@ -5385,14 +5715,15 @@
     fi
   
  echo $ac_n "checking for u16 typedef""... $ac_c" 1>&6
-echo "configure:5389: checking for u16 typedef" >&5
+echo "configure:5719: 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 5394 "configure"
+#line 5724 "configure"
 #include "confdefs.h"
-#include <stdlib.h>
+#define _GNU_SOURCE 1
+    #include <stdlib.h>
     #include <sys/types.h>
 int main() {
 
@@ -5401,7 +5732,7 @@
     
 ; return 0; }
 EOF
-if { (eval echo configure:5405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gnupg_cv_typedef_u16=yes
 else
@@ -5422,14 +5753,15 @@
     fi
   
  echo $ac_n "checking for u32 typedef""... $ac_c" 1>&6
-echo "configure:5426: checking for u32 typedef" >&5
+echo "configure:5757: 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 5431 "configure"
+#line 5762 "configure"
 #include "confdefs.h"
-#include <stdlib.h>
+#define _GNU_SOURCE 1
+    #include <stdlib.h>
     #include <sys/types.h>
 int main() {
 
@@ -5438,7 +5770,7 @@
     
 ; return 0; }
 EOF
-if { (eval echo configure:5442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gnupg_cv_typedef_u32=yes
 else
@@ -5460,7 +5792,7 @@
   
 
 echo $ac_n "checking size of unsigned short""... $ac_c" 1>&6
-echo "configure:5464: checking size of unsigned short" >&5
+echo "configure:5796: 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
@@ -5468,9 +5800,10 @@
   ac_cv_sizeof_unsigned_short=2
 else
   cat > conftest.$ac_ext <<EOF
-#line 5472 "configure"
+#line 5804 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -5479,7 +5812,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:5483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5816: \"$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
@@ -5499,7 +5832,7 @@
 
 
 echo $ac_n "checking size of unsigned int""... $ac_c" 1>&6
-echo "configure:5503: checking size of unsigned int" >&5
+echo "configure:5836: 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
@@ -5507,9 +5840,10 @@
   ac_cv_sizeof_unsigned_int=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 5511 "configure"
+#line 5844 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -5518,7 +5852,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:5522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5856: \"$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
@@ -5538,7 +5872,7 @@
 
 
 echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6
-echo "configure:5542: checking size of unsigned long" >&5
+echo "configure:5876: 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
@@ -5546,9 +5880,10 @@
   ac_cv_sizeof_unsigned_long=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 5550 "configure"
+#line 5884 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -5557,7 +5892,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:5561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5896: \"$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
@@ -5577,7 +5912,7 @@
 
 
 echo $ac_n "checking size of unsigned long long""... $ac_c" 1>&6
-echo "configure:5581: checking size of unsigned long long" >&5
+echo "configure:5916: 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
@@ -5585,9 +5920,10 @@
   ac_cv_sizeof_unsigned_long_long=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 5589 "configure"
+#line 5924 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -5596,7 +5932,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:5600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5936: \"$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
@@ -5625,12 +5961,12 @@
 
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:5629: checking for vprintf" >&5
+echo "configure:5965: 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 5634 "configure"
+#line 5970 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -5653,7 +5989,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5993: \"$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
@@ -5677,12 +6013,12 @@
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:5681: checking for _doprnt" >&5
+echo "configure:6017: 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 5686 "configure"
+#line 6022 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -5705,7 +6041,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6045: \"$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
@@ -5732,12 +6068,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:5736: checking for $ac_func" >&5
+echo "configure:6072: 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 5741 "configure"
+#line 6077 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5760,7 +6096,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6100: \"$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
@@ -5787,12 +6123,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:5791: checking for $ac_func" >&5
+echo "configure:6127: 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 5796 "configure"
+#line 6132 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5815,7 +6151,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6155: \"$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
@@ -5842,12 +6178,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:5846: checking for $ac_func" >&5
+echo "configure:6182: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5851 "configure"
+#line 6187 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5870,7 +6206,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6210: \"$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
@@ -5894,15 +6230,15 @@
 fi
 done
 
-for ac_func in waitpid wait4 sigaction sigprocmask
+for ac_func in waitpid wait4 sigaction sigprocmask fseeko
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5901: checking for $ac_func" >&5
+echo "configure:6237: 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 5906 "configure"
+#line 6242 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5925,7 +6261,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6265: \"$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
@@ -5950,73 +6286,15 @@
 done
 
 
-if test $try_large_file = "yes"; then
-for ac_func in fopen64 fstat64
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5958: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 5963 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:5986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-fi
-
  for ac_func in mlock
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6015: checking for $ac_func" >&5
+echo "configure:6293: 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 6020 "configure"
+#line 6298 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6039,7 +6317,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6321: \"$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
@@ -6068,17 +6346,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6072: checking for $ac_hdr" >&5
+echo "configure:6350: 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 6077 "configure"
+#line 6355 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6082: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6360: \"$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*
@@ -6107,7 +6385,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:6111: checking for memlk in -lrt" >&5
+echo "configure:6389: 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
@@ -6115,7 +6393,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lrt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6119 "configure"
+#line 6397 "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
@@ -6126,7 +6404,7 @@
 memlk()
 ; return 0; }
 EOF
-if { (eval echo configure:6130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6408: \"$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
@@ -6154,12 +6432,12 @@
 fi
 
             echo $ac_n "checking whether mlock is in sys/mman.h""... $ac_c" 1>&6
-echo "configure:6158: checking whether mlock is in sys/mman.h" >&5
+echo "configure:6436: 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 6163 "configure"
+#line 6441 "configure"
 #include "confdefs.h"
 
                     #include <assert.h>
@@ -6184,7 +6462,7 @@
                 
 ; return 0; }
 EOF
-if { (eval echo configure:6188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6466: \"$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
@@ -6207,7 +6485,7 @@
     fi
     if test "$ac_cv_func_mlock" = "yes"; then
         echo $ac_n "checking whether mlock is broken""... $ac_c" 1>&6
-echo "configure:6211: checking whether mlock is broken" >&5
+echo "configure:6489: 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
@@ -6216,7 +6494,7 @@
            
 else
   cat > conftest.$ac_ext <<EOF
-#line 6220 "configure"
+#line 6498 "configure"
 #include "confdefs.h"
 
                 #include <stdlib.h>
@@ -6246,7 +6524,7 @@
 
             
 EOF
-if { (eval echo configure:6250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6528: \"$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
@@ -6280,17 +6558,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6284: checking for $ac_hdr" >&5
+echo "configure:6562: 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 6289 "configure"
+#line 6567 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6572: \"$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*
@@ -6317,12 +6595,12 @@
 done
 
 echo $ac_n "checking if mkdir takes one argument""... $ac_c" 1>&6
-echo "configure:6321: checking if mkdir takes one argument" >&5
+echo "configure:6599: 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 6326 "configure"
+#line 6604 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6339,7 +6617,7 @@
 mkdir ("foo", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:6343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gnupg_cv_mkdir_takes_one_arg=no
 else
@@ -6366,17 +6644,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6370: checking for $ac_hdr" >&5
+echo "configure:6648: 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 6375 "configure"
+#line 6653 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6380: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6658: \"$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*
@@ -6404,7 +6682,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:6408: checking for cap_init in -lcap" >&5
+echo "configure:6686: 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
@@ -6412,7 +6690,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6416 "configure"
+#line 6694 "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
@@ -6423,7 +6701,7 @@
 cap_init()
 ; return 0; }
 EOF
-if { (eval echo configure:6427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6705: \"$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
@@ -6471,17 +6749,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6475: checking for $ac_hdr" >&5
+echo "configure:6753: 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 6480 "configure"
+#line 6758 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6485: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6763: \"$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*
@@ -6509,7 +6787,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:6513: checking whether IPC_RMID allowes subsequent attaches" >&5
+echo "configure:6791: 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
@@ -6517,7 +6795,7 @@
   gnupg_cv_ipc_rmid_deferred_release="assume-no"
 else
   cat > conftest.$ac_ext <<EOF
-#line 6521 "configure"
+#line 6799 "configure"
 #include "confdefs.h"
 
              #include <sys/types.h>
@@ -6543,7 +6821,7 @@
              }
          
 EOF
-if { (eval echo configure:6547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6825: \"$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
@@ -6573,12 +6851,12 @@
        fi
 
        echo $ac_n "checking whether SHM_LOCK is available""... $ac_c" 1>&6
-echo "configure:6577: checking whether SHM_LOCK is available" >&5
+echo "configure:6855: 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 6582 "configure"
+#line 6860 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
              #include <sys/ipc.h>
@@ -6590,7 +6868,7 @@
              
 ; return 0; }
 EOF
-if { (eval echo configure:6594: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6872: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gnupg_cv_ipc_have_shm_lock="yes"
 else
@@ -6624,7 +6902,7 @@
 
 if test "$try_dev_random" = yes ; then
     echo $ac_n "checking for random device""... $ac_c" 1>&6
-echo "configure:6628: checking for random device" >&5
+echo "configure:6906: 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
@@ -6641,7 +6919,7 @@
     fi
 else
     echo $ac_n "checking for random device""... $ac_c" 1>&6
-echo "configure:6645: checking for random device" >&5
+echo "configure:6923: checking for random device" >&5
     ac_cv_have_dev_random=no
     echo "$ac_t""has been disabled" 1>&6
 fi
@@ -6651,17 +6929,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6655: checking for $ac_hdr" >&5
+echo "configure:6933: 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 6660 "configure"
+#line 6938 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6943: \"$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*
@@ -6688,7 +6966,7 @@
 done
 
     echo $ac_n "checking for random device ioctl""... $ac_c" 1>&6
-echo "configure:6692: checking for random device ioctl" >&5
+echo "configure:6970: 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
@@ -6842,7 +7120,7 @@
 
 
 echo $ac_n "checking for mpi assembler functions""... $ac_c" 1>&6
-echo "configure:6846: checking for mpi assembler functions" >&5
+echo "configure:7124: 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
@@ -6884,17 +7162,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6888: checking for $ac_hdr" >&5
+echo "configure:7166: 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 6893 "configure"
+#line 7171 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7176: \"$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*
@@ -6922,7 +7200,7 @@
 
   if test "$ac_cv_header_zlib_h" = yes ; then
       echo $ac_n "checking for deflateInit2_ in -lz""... $ac_c" 1>&6
-echo "configure:6926: checking for deflateInit2_ in -lz" >&5
+echo "configure:7204: 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
@@ -6930,7 +7208,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6934 "configure"
+#line 7212 "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
@@ -6941,7 +7219,7 @@
 deflateInit2_()
 ; return 0; }
 EOF
-if { (eval echo configure:6945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7223: \"$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
@@ -7046,6 +7324,17 @@
     fi
   
 
+# add some extra libs here so that previous tests don't fail for
+# mysterious reasons - the final link step shoudl bail out. 
+case "${target}" in
+    *-*-mingw32*)
+        LIBS="$LIBS -lwsock32"
+        ;;
+    *)
+       ;;
+esac
+
+
 if test "$GCC" = yes; then
     if test "$MAINTAINER_MODE" = "yes"; then
         CFLAGS="$CFLAGS -Wall -Wcast-align -Wshadow -Wstrict-prototypes"
@@ -7240,6 +7529,9 @@
 s%@FAQPROG@%$FAQPROG%g
 s%@WORKING_FAQPROG_TRUE@%$WORKING_FAQPROG_TRUE%g
 s%@WORKING_FAQPROG_FALSE@%$WORKING_FAQPROG_FALSE%g
+s%@DOCBOOK_TO_TEXI@%$DOCBOOK_TO_TEXI%g
+s%@HAVE_DOCBOOK_TO_TEXI_TRUE@%$HAVE_DOCBOOK_TO_TEXI_TRUE%g
+s%@HAVE_DOCBOOK_TO_TEXI_FALSE@%$HAVE_DOCBOOK_TO_TEXI_FALSE%g
 s%@MPI_OPT_FLAGS@%$MPI_OPT_FLAGS%g
 s%@NM@%$NM%g
 s%@RANLIB@%$RANLIB%g
diff -urN gnupg-1.0.4/configure.in gnupg-1.0.5/configure.in
--- gnupg-1.0.4/configure.in	Tue Oct 17 15:29:31 2000
+++ gnupg-1.0.5/configure.in	Tue Apr 17 18:20:17 2001
@@ -1,8 +1,24 @@
+dnl Configure script for GnuPG
+dnl Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 dnl
-dnl Configure template for GNUPG
+dnl This file is part of GnuPG.
+dnl
+dnl GnuPG is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl 
+dnl GnuPG is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 dnl
 dnl (Process this file with autoconf to produce a configure script.)
-AC_REVISION($Revision: 1.103.2.27 $)dnl
+AC_REVISION($Revision: 1.103.2.33 $)dnl
 
 dnl Must reset CDPATH so that bash's cd does not print to stdout
 CDPATH=
@@ -15,7 +31,7 @@
 AM_INIT_AUTOMAKE(gnupg,`cat $srcdir/VERSION`)
 
 
-ALL_LINGUAS="da de eo es_ES fr id it ja nl pl pt_BR pt_PT ru sv"
+ALL_LINGUAS="da de eo es_ES et fr id it ja nl pl pt_BR pt_PT ru sv tr"
 static_modules="sha1 md5 rmd160"
 static_random_module=""
 
@@ -81,21 +97,11 @@
      try_asm_modules=$enableval, try_asm_modules=yes)
 AC_MSG_RESULT($try_asm_modules)
 
-AC_MSG_CHECKING([whether memory debugging is requested])
-AC_ARG_ENABLE(m-debug,
-[  --enable-m-debug        enable debugging of memory allocation],
-use_m_debug=$enableval, use_m_debug=no)
-AC_MSG_RESULT($use_m_debug)
-if test "$use_m_debug" = yes; then
-    AC_DEFINE(M_DEBUG)
-    use_m_guard=yes
-else
-    AC_MSG_CHECKING([whether memory guard is requested])
-    AC_ARG_ENABLE(m-guard,
+AC_MSG_CHECKING([whether memory guard is requested])
+AC_ARG_ENABLE(m-guard,
     [  --enable-m-guard        enable memory guard facility],
     use_m_guard=$enableval, use_m_guard=no)
-    AC_MSG_RESULT($use_m_guard)
-fi
+AC_MSG_RESULT($use_m_guard)
 if test "$use_m_guard" = yes ; then
     AC_DEFINE(M_GUARD)
 fi
@@ -130,12 +136,6 @@
 dnl
 case "${target}" in
     *-*-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?
-        CC="${target}-gcc"
-        CPP="${target}-gcc -E"
-        RANLIB="${target}-ranlib"
         disallowed_modules="rndunix rndlinux rndegd"
         ;;
     *)
@@ -151,22 +151,23 @@
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
 AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-dnl AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
+AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_PROG_CC
 AC_PROG_CPP
 AC_ISC_POSIX
+AC_SYS_LARGEFILE
 AC_PROG_INSTALL
 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
+GNUPG_CHECK_DOCBOOK_TO_TEXI
 
 MPI_OPT_FLAGS=""
 
 
 try_gettext=yes
 try_gdbm=yes
-try_large_file=yes
 case "${target}" in
     *-*-mingw32*)
         # special stuff for Windoze NT
@@ -206,7 +207,6 @@
         if test -z "$GCC" ; then
             CFLAGS="$CFLAGS -Ae -D_HPUX_SOURCE"
         fi
-        try_large_file="no"
         ;;
     *-dec-osf4*)
         if test -z "$GCC" ; then
@@ -217,9 +217,6 @@
         ;;
     m68k-atari-mint)
         ;;
-    *-solaris*)
-        try_large_file="no"
-        ;;
     *)
        ;;
 esac
@@ -321,21 +318,28 @@
 fi
 fi
 
-
 dnl Solaris needs -lsocket and -lnsl. Unisys system includes
 dnl gethostbyname in libsocket but needs libnsl for socket.
-AC_CHECK_LIB(nsl, gethostbyname)
-AC_CHECK_LIB(socket, socket, ac_need_libsocket=1, ac_try_nsl=1)
-if test x$ac_need_libsocket = x1; then
-    LIBS="$LIBS -lsocket"
-fi
-if test x$ac_try_nsl = x1; then
-    AC_CHECK_LIB(nsl, gethostbyname, ac_need_libnsl=1)
-    if test x$ac_need_libnsl = x1
-    then
-        LIBS="$LIBS -lnsl"
-    fi
-fi
+dnl The test does not workfor all system, so some are hardcoded here.
+case "${target}" in
+   i386-univel-sysv4*)
+        LIBS="$LIBS -lsocket -lnsl"
+        ;;
+   *)
+      AC_CHECK_LIB(nsl, gethostbyname)
+      AC_CHECK_LIB(socket, socket, ac_need_libsocket=1, ac_try_nsl=1)
+      if test x$ac_need_libsocket = x1; then
+          LIBS="$LIBS -lsocket"
+      fi
+      if test x$ac_try_nsl = x1; then
+         AC_CHECK_LIB(nsl, gethostbyname, ac_need_libnsl=1)
+         if test x$ac_need_libnsl = x1
+         then
+            LIBS="$LIBS -lnsl"
+         fi
+      fi
+      ;;
+esac
 
 
 if test "$try_dynload" = yes ; then
@@ -424,11 +428,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)
-
-if test $try_large_file = "yes"; then
-AC_CHECK_FUNCS(fopen64 fstat64)
-fi
+AC_CHECK_FUNCS(waitpid wait4 sigaction sigprocmask fseeko)
 
 GNUPG_CHECK_MLOCK
 GNUPG_FUNC_MKDIR_TAKES_ONE_ARG
@@ -706,6 +706,17 @@
 GNUPG_DO_LINK_FILES
 
 GNUPG_CHECK_GNUMAKE
+
+# add some extra libs here so that previous tests don't fail for
+# mysterious reasons - the final link step shoudl bail out. 
+case "${target}" in
+    *-*-mingw32*)
+        LIBS="$LIBS -lwsock32"
+        ;;
+    *)
+       ;;
+esac
+
 
 if test "$GCC" = yes; then
     if test "$MAINTAINER_MODE" = "yes"; then
diff -urN gnupg-1.0.4/debian/changelog gnupg-1.0.5/debian/changelog
--- gnupg-1.0.4/debian/changelog	Mon Oct 16 17:43:42 2000
+++ gnupg-1.0.5/debian/changelog	Thu Mar  8 19:31:02 2001
@@ -1,3 +1,40 @@
+gnupg (1.0.4-3) unstable; urgency=medium
+
+  * debian/rules (binary): make gpg binary suid, closes: #86433.
+  * debian/postinst: don't use suidregister.
+  * debian/postrm: removed (only called suidunregister).
+  * debian/control: conflict with suidmanager << 0.50.
+  * mpi/longlong.h: apply fix for ARM long long artimetic from Philip
+    Blundell <philb@gnu.org>, closes: #87487.
+  * debian/preinst: the old GnuPG debs have moved to people.debian.org.
+  * cipher/random.c: #include <time.h> as well as <sys/time.h>
+  * g10/misc.c: likewise.
+  * debian/rules: define a strip alias which removes the .comment and
+    .note sections.
+  * debian/rules (binary-arch): use it.
+  * debian/lintian.override: new file; override the SUID warning from
+    lintian.
+  * debian/rules (binary-arch): install it.
+
+ -- James Troup <james@nocrew.org>  Sun, 25 Feb 2001 05:24:58 +0000
+
+gnupg (1.0.4-2) stable unstable; urgency=high
+
+  * Apply security fix patch from Werner.
+  * Apply another patch from Werner to fix bogus warning on Rijndael
+    usage.
+  * Change section to 'non-US'.
+
+ -- James Troup <james@nocrew.org>  Mon, 12 Feb 2001 07:47:02 +0000
+
+gnupg (1.0.4-1) stable unstable; urgency=high
+
+  * New upstream version.
+  * Fixes a serious bug which could lead to false signature verification
+    results when more than one signature is fed to gpg.
+
+ -- James Troup <james@nocrew.org>  Tue, 17 Oct 2000 17:26:17 +0100
+
 gnupg (1.0.3b-1) unstable; urgency=low
 
   * New upstream snapshot version.
diff -urN gnupg-1.0.4/debian/control gnupg-1.0.5/debian/control
--- gnupg-1.0.4/debian/control	Mon Oct 16 17:43:42 2000
+++ gnupg-1.0.5/debian/control	Thu Mar  8 19:31:02 2001
@@ -1,5 +1,5 @@
 Source: gnupg
-Section: utils
+Section: non-US
 Priority: optional
 Maintainer: James Troup <james@nocrew.org>
 Standards-Version: 3.1.1.1
@@ -9,7 +9,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, makedev (>= 2.3.1-13)
 Suggests: gnupg-doc
-Conflicts: gpg-rsa, gpg-rsaref
+Conflicts: gpg-rsa, gpg-rsaref, suidmanager (<< 0.50)
 Replaces: gpg-rsa, gpg-rsaref
 Provides: gpg-rsa, gpg-rsaref
 Description: GNU privacy guard - a free PGP replacement.
diff -urN gnupg-1.0.4/debian/preinst gnupg-1.0.5/debian/preinst
--- gnupg-1.0.4/debian/preinst	Sat Jan  9 16:06:49 1999
+++ gnupg-1.0.5/debian/preinst	Thu Mar  8 19:31:02 2001
@@ -34,7 +34,7 @@
 If at any stage you need a pre-0.3.3 gnupg, you can find source and
 binaries for i386, m68k, alpha, powerpc and hurd-i386 at 
 
-   http://james.nocrew.org/gnupg/
+   http://people.debian.org/~troup/gnupg/
 
 Press return to continue
 EOF
diff -urN gnupg-1.0.4/debian/rules gnupg-1.0.5/debian/rules
--- gnupg-1.0.4/debian/rules	Mon Oct 16 17:43:42 2000
+++ gnupg-1.0.5/debian/rules	Thu Mar  8 19:31:02 2001
@@ -9,6 +9,8 @@
 # paternity under the Copyright, Designs and Patents Act 1988.)
 # This file may have to be extensively modified
 
+STRIP=strip --remove-section=.comment --remove-section=.note
+
 build:
 	$(checkdir)
 	./configure --prefix=/usr --with-included-gettext
@@ -34,11 +36,12 @@
 	install -d debian/tmp/DEBIAN/
 	install -m 755 debian/preinst debian/prerm debian/postinst debian/postrm debian/tmp/DEBIAN/
 	$(MAKE) prefix=`pwd`/debian/tmp/usr mandir=`pwd`/debian/tmp/usr/share/man install
-	strip debian/tmp/usr/bin/*
+	$(STRIP) debian/tmp/usr/bin/*
+	chmod 4755 debian/tmp/usr/bin/gpg
 	chmod 644 debian/tmp/usr/lib/gnupg/*
 	sed -e "s#../g10/gpg#gpg#" < tools/lspgpot > debian/tmp/usr/bin/lspgpot
 	chmod 755 debian/tmp/usr/bin/lspgpot
-	strip --strip-unneeded debian/tmp/usr/lib/gnupg/*
+	$(STRIP) --strip-unneeded debian/tmp/usr/lib/gnupg/*
 	# In response to #53714... no idea if it's correct, will check with upstream
 	mv debian/tmp/usr/share/locale/es_ES debian/tmp/usr/share/locale/es
 	sed -e "s#/usr/local/#/usr/#" < debian/tmp/usr/share/man/man1/gpg.1 \
@@ -57,6 +60,8 @@
 	gzip -9v debian/tmp/usr/share/doc/gnupg/*
 	ln -s changelog.g10.gz debian/tmp/usr/share/doc/gnupg/changelog.gz
 	install -m 644 debian/copyright debian/tmp/usr/share/doc/gnupg/
+	install -d debian/tmp/usr/share/lintian/overrides/
+	install -m 644 debian/lintian.override debian/tmp/usr/share/lintian/overrides/gnupg
 	dpkg-shlibdeps g10/gpg
 	dpkg-gencontrol -isp
 	chown -R root.root debian/tmp
diff -urN gnupg-1.0.4/doc/ChangeLog gnupg-1.0.5/doc/ChangeLog
--- gnupg-1.0.4/doc/ChangeLog	Sat Oct 14 18:19:16 2000
+++ gnupg-1.0.5/doc/ChangeLog	Fri Apr 20 16:13:08 2001
@@ -1,3 +1,70 @@
+2001-04-20  Werner Koch  <wk@gnupg.org>
+
+	* faq.raw (Maintained-by): Removed note that load-extension is not
+	available under Windoze.
+
+	* gpg.sgml: Add new --charset UTF-8.
+
+2001-04-19  Werner Koch  <wk@gnupg.org>
+
+	* faq.raw: Add a note about dates displayed as ????-??-??.
+
+2001-04-17  Werner Koch  <wk@gnupg.org>
+
+	* Makefile.am (%.texi): Add rules to create .texi from .sgml.
+	However we can't automate this because automake does not like
+	.texi files as BUILT_SOURCES.
+	(%.dvi,%.ps): Removed these rules, because they are not needed
+	and get in the way of automake's dvi target
+
+	* HACKING: Changed CVS description.
+
+2001-04-06  Werner Koch  <wk@gnupg.org>
+
+	* gpg.sgml: Small typo fixes by Florian Weimer.
+
+2001-03-27  Werner Koch  <wk@gnupg.org>
+
+	* gpg.sgml: Add --no-sig-cache and --no-sig-create-check.
+
+2001-03-23  Werner Koch  <wk@gnupg.org>
+
+	* DETAILS: New status UNEXPECTED.
+
+2001-03-13  Werner Koch  <wk@gnupg.org>
+
+	* gpg.sgml: Described --fixed-list-mode.
+
+2001-03-06  Werner Koch  <wk@gnupg.org>
+
+	* gpgv.sgml: Changed some gpg to gpgv. Thanks to John A. Murdie.
+
+2001-03-03  Werner Koch  <wk@gnupg.org>
+
+	* gpg.sgml: Tell something about the 0x12345678! key ID syntax.
+
+2001-01-18  Werner Koch  <wk@gnupg.org>
+
+	* README.W32: Changed building instructions for MinGW32/CPD 0.3 
+
+2001-01-09  Werner Koch  <wk@gnupg.org>
+
+	* DETAILS: Fixed docs for NEED_PASSPHRASE and added USERID_HINT.
+
+2000-11-30  Werner Koch  <wk@gnupg.org>
+
+	* gpg.sgml: Fixed the description of --verify.  Add a short note
+	the warnings sections.
+
+2000-10-19  Werner Koch  <wk@gnupg.org>
+
+	* gpg.sgml: Fixed doc for --allow-non-selfsigned-uid.
+	Add entry for --ignore-crc-error.
+
+2000-10-18  Werner Koch  <wk@gnupg.org>
+
+	* OpenPGP: Dropped the paragraph that RSA is not implemented.
+
 2000-10-14  Werner Koch  <wk@gnupg.org>
 
 	* faq.raw: Add an answer to the problem of multiple signatures.
@@ -88,4 +155,16 @@
 	* gpg.1pod: Spelling and grammar corrections (John A. Martin)
 	* FAQ: Ditto.
 	* DETAILS: Ditto.
+
+
+ Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
 
diff -urN gnupg-1.0.4/doc/DETAILS gnupg-1.0.5/doc/DETAILS
--- gnupg-1.0.4/doc/DETAILS	Wed Sep  6 16:26:45 2000
+++ gnupg-1.0.5/doc/DETAILS	Thu Apr 19 12:01:02 2001
@@ -18,6 +18,7 @@
 	    letter, but be prepared that additional information may follow
 	    in some future versions. (not used for secret keys)
 		o = Unknown (this key is new to the system)
+                i = The key is invalid (e.g. due to a missing self-signature)
 		d = The key has been disabled
 		r = The key has been revoked
 		e = The key has expired
@@ -46,7 +47,17 @@
 	    information may follow in some future versions.
 10. Field:  User-ID.  The value is quoted like a C string to avoid
 	    control characters (the colon is quoted "\x3a").
+11. Field:  Signature class 
+12. Field:  Key capabilities:
+                e = encrypt
+                s = sign
+                c = certify
+            A key may have any combination of them.  The primary key has in
+            addition to these letters, uppercase version of the letter to
+            denote the _usable_ capabilities of the entire key.  
 
+All dates are displayed in the format yyyy-mm-dd unless you use the option
+--fixed-list-mode in which case they are dispplay as seconds since epoch.
 More fields may be added later.
 
 If field 1 has the tag "pkd", a listing looks like this:
@@ -67,6 +78,9 @@
 
     GOODSIG	<long keyid>  <username>
 	The signature with the keyid is good.
+        For each signature only one of the three codes GOODSIG, BADSIG
+        or ERRSIG will be emitted and they may be used as a marker for
+        a new signature.
 
     BADSIG	<long keyid>  <username>
 	The signature with the keyid has not been verified okay.
@@ -82,7 +96,7 @@
     VALIDSIG	<fingerprint in hex> <sig_creation_date> <sig-timestamp>
 	The signature with the keyid is good. This is the same
 	as GOODSIG but has the fingerprint as the argument. Both
-	status lines ere emitted for a good signature.
+	status lines are emitted for a good signature.
 	sig-timestamp is the signature creation time in seconds after
 	the epoch.
 
@@ -107,6 +121,11 @@
 	    3 - Invalid packet found, this may indicate a non OpenPGP message.
 	You may see more than one of these status lines.
 
+    UNEXPECTED <what>
+        Unexpected data has been encountered
+            0 - not further specified               1       
+  
+
     TRUST_UNDEFINED
     TRUST_NEVER
     TRUST_MARGINAL
@@ -141,7 +160,7 @@
     GET_HIDDEN
     GOT_IT
 
-    NEED_PASSPHRASE <long keyid>  <keytype>  <keylength>
+    NEED_PASSPHRASE <long main keyid> <long keyid> <keytype> <keylength>
 	Issued whenever a passphrase is needed.
 	keytype is the numerical value of the public key algorithm
 	or 0 if this is not applicable, keylength is the length
@@ -226,6 +245,13 @@
 		   'S' = standard
 		   (only the first character should be checked)
 	    class: 2 hex digits with the signature class
+        
+    KEY_CREATED <type>
+        A key has been created
+            type: 'B' = primary and subkey
+                  'P' = primary
+                  'S' = subkey
+
 
     SESSION_KEY  <algo>:<hexdigits>
 	The session key used to decrypt the message.  This message will
@@ -233,6 +259,21 @@
 	is used.  The format is suitable to be passed to the option
 	--override-session-key
 
+    NOTATION_NAME <name> 
+    NOTATION_DATA <string>
+        name and string are %XX escaped; the data may be splitted
+        among several notation_data lines.
+
+    USERID_HINT <long main keyid> <string>
+        Give a hint about the user ID for a certain keyID. 
+
+    POLICY_URL <string>
+        string is %XX escaped
+
+    BEGIN_STREAM
+    END_STREAM
+        Issued by pipemode.
+
 
 Key generation
 ==============
@@ -658,6 +699,41 @@
       1 = keyblock
       2 = list of 20 byte padded fingerprints
       3 = list of list fingerprints (but how to we key them?)
+
+
+
+Pipemode
+========
+This mode can be used to perform multiple operations with one call to
+gpg. It comes handy in cases where you have to verify a lot of
+signatures. Currently we support only detached signatures.  This mode
+is a kludge to avoid running gpg n daemon mode and using Unix Domain
+Sockets to pass the data to it.  There is no easy portable way to do
+this under Windows, so we use plain old pipes which do work well under
+Windows.  Because there is no way to signal multiple EOFs in a pipe we
+have to embed control commands in the data stream: We distinguish
+between a data state and a control state.  Initially the system is in
+data state but it won't accept any data.  Instead it waits for
+transition to control state which is done by sending a single '@'
+character.  While in control state the control command os expected and
+this command is just a single byte after which the system falls back
+to data state (but does not necesary accept data now).  The simplest
+control command is a '@' which just inserts this character into the
+data stream.
+
+Here is the format we use for detached signatures:
+"@<"  - Begin of new stream
+"@B"  - Detached signature follows.
+        This emits a control packet (1,'B')
+<detached_signature>
+"@t"  - Signed text follows. 
+        This emits the control packet (2, 'B')
+<signed_text>
+"@."  - End of operation. The final control packet forces signature
+        verification
+"@>"  - End of stream   
+
+
 
 
 
diff -urN gnupg-1.0.4/doc/FAQ gnupg-1.0.5/doc/FAQ
--- gnupg-1.0.4/doc/FAQ	Tue Oct 17 15:16:56 2000
+++ gnupg-1.0.5/doc/FAQ	Fri Apr 20 20:19:40 2001
@@ -1,9 +1,11 @@
 
 GNUPG FREQUENTLY ASKED QUESTIONS
 
-Version: 0.2
-Last-Modified: Oct 14, 2000
-Maintained-by: Nils Ellmenreich <nils 'at' infosun.fmi.uni-passau.de>
+
+Version: 1.2
+Last-Modified: Apr 4, 2001
+Maintained-by: Nils Ellmenreich <nils 'at' gnupg.org>
+
 
 This is the GnuPG FAQ. The latest HTML version is available  
  here.   <http://www.gnupg.org/faq.html>
@@ -12,10 +14,13 @@
 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.
+Please send additions and corrections to the maintainer. It would be
+most convenient if you could provide the answer to be included
+here. Your help is very much appreciated.
+
+Please, 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. In that case
+you could search in the mailing list archive.
 
 
 
@@ -24,7 +29,7 @@
    1.1) What is GnuPG?
    1.2) Is GnuPG compatible with PGP?
 
- 2. SOURCES OF INFORMATION
+ 2. SOURCES of INFORMATION
    2.1) Where can I find more information?
    2.2) Where do I get GnuPG?
 
@@ -50,26 +55,37 @@
    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?
+   4.14) Which email-client can I use with GnuPG?
+   4.15) Can't we have a gpg library?
 
  5. COMPATIBILITY ISSUES 
-   5.1) How can I encrypt a message so that PGP 2.x is able to decrypt it?
+   5.1) How can I encrypt a message with GnuPG so that PGP is able to decrypt it?
    5.2) How do I migrate from PGP 2.x to GnuPG?
-   5.3) How can I conventional encrypt a message, so that PGP can decrypt
-	it?
+   5.3) (removed)
    5.4) Why is PGP 5.x not able to encrypt messages with some keys?
    5.5) Why is PGP 5.x not able to verify my messages?
    5.6) How do I transfer owner trust values from PGP to GnuPG?
-   5.7) PGP 5.x, 6.x do not like my secret key.
+   5.7) PGP does 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
+   6.2) Large File Support doesn't work ..
+   6.3) 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 
+   6.4) What does "skipping pubkey 1: already loaded" mean?
+   6.5) GnuPG 1.0.4 doesn't create ~/.gnupg ...
+   6.6) An ElGamal signature does not verify anymore since version 1.0.2 ...
+   6.7) Old versions of GnuPG can't verify ElGamal signatures
+   6.8) When I use --clearsign, the plain text has sometimes extra dashes 
 	in it - why?
-   6.6) What is the thing with "can't handle multiple signatures"?
+   6.9) What is the thing with "can't handle multiple signatures"?
+   6.10) If I submit a key to a keyserver, nothing happens ...
+   6.11) I get "gpg: waiting for lock ..."
+   6.12) Older gpg's (e.g., 1.0) have problems with keys from newer gpgs ...
+   6.13) With 1.0.4, I get "this cipher algorithm is deprecated ..."
+   6.14) Some dates are displayed as ????-??-??, why?
+   6.15) I still have a problem. How do I report a bug?
+   6.16) Why doesn't GnuPG support X509 certificates?
 
  7. ADVANCED TOPICS
    7.1) How does this whole thing work?
@@ -79,6 +95,8 @@
    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?
+   7.7) What is the list of preferred algorithms?
+   7.8) How do I change the list of preferred algorithms?
 
  8. ACKNOWLEDGEMENTS
 
@@ -101,7 +119,7 @@
     the OpenPGP standard. But there are some interoperability
     problems. See questions 5.1ff. for details.
 
-2. SOURCES OF INFORMATION
+2. SOURCES of INFORMATION
 
 2.1) Where can I find more information?
 
@@ -114,19 +132,28 @@
     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.
+    you'll find a searchable online archive of the GnuPG mailing
+    lists. Most interesting should be gnupg-users for all user-related
+    issues and gnupg-devel if you want to get in touch with the
+    developers.
 
     *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.
+    documentation. In addition, search the list archive - maybe your
+    question has already been discussed. This way you help people focus
+    on topics that have not yet been resolved.
+
+     The GnuPG source distribution contains a subdirectory 
+    ./doc where some additional documentation is located
+    (mainly interesting for hackers, not the casual user).
 
 2.2) Where do I get GnuPG?
 
-    You can download the GNU Privacy Guard from it's primary FTP server
+    You can download the GNU Privacy Guard from its primary FTP server
     ftp.gnupg.org or from
     one of the mirrors: <http://www.gnupg.org/mirror.html>
-
+    The current version is 1.0.4, please upgrade to this version as it
+    fixes a security bug regarding the verification of multiple signatures.
 
 
 3. INSTALLATION 
@@ -145,10 +172,14 @@
     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.
+    option --enable-static-rnd=linux. In addition, there's
+    also the kernel random device by Andi Maier 
+	    < http://www.cosy.sbg.ac.at/~andi>
+    <http://www.cosy.sbg.ac.at/~andi>, but it's still beta. Use at
+    own risk!
 
     On other systems, the Entropy Gathering Daemon (EGD) is a good
-    choice. It is a perl-daemon that monitors system activity nad hashes
+    choice. It is a perl-daemon that monitors system activity and 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.
 
@@ -174,9 +205,6 @@
     the following line to your ~/.gnupg/options: 
     load-extension idea 
 
-    The extension is not available for the Windows version of GnuPG.
-
-
 4. USAGE
 
 4.1) What is the recommended key size?
@@ -185,9 +213,20 @@
     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:
+    but you should then check the fingerprint of this key:
     "gpg --fingerprint --fingerprint <user ID>".
 
+    As for the key algorithms, you should stick with the default (i.e.,
+    DSA signature and ElGamal encryption). A ElGamal signing key has the
+    following disadvantages: the signature is larger, it is hard to
+    create such a key useful for signatures which can withstand some
+    real world attacks, you don't get any extra security compared to
+    DSA, there might be compatibility problems with certain PGP
+    versions. It has only been introduced because at the time it was
+    not clear whether there is was patent on DSA.
+
+
+
 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
@@ -196,7 +235,7 @@
     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
+    and caps lock 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).
 
@@ -331,8 +370,8 @@
 
 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 }' 
+     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.
@@ -369,22 +408,74 @@
     turn can revoke all the subkeys installed on that machine and
     install new subkeys.  
 
+4.14) Which email-client can I use with GnuPG?
 
+    Using GnuPG to encrypt email is one of the most popular
+    uses. Several mail clients or mail user-agents (MUA) support GnuPG
+    at varying degrees. Simplifying a bit, there are two ways a mail can
+    be encrypted with GnuPG: the "old style" ASCII armor, i.e. plain
+    text encryption, and RFC2015 style (previously PGP/MIME, now
+    OpenPGP). The latter has full MIME support. Some MUAs support only
+    one of them, so whichever you actually use depends on your needs as
+    well as the capabilities of your addressee.
+
+    The following list is probably not exhaustive:
+
+    OpenPGP: Mutt (Unix), Emacs/Mew, Becky2 (Windows, with plugin),
+             TkRat (Unix). There is effort for a Mozilla plugin and
+	     Emacs/GNUS has support in the current CVS.
+
+    ASCII:   Emacs/{VM,GNUS}/MailCrypt, Mutt(Unix), Pine(Unix), and
+             probably many more.
+
+    A good overview of PGP-support is present at 
+    http://cryptorights.org/pgp-users/pgp-mail-clients.html. 
+    Direct GnuPG support is not mentioned, however, it certain cases it
+    may be possible to use a wrapper. 
+
+
+4.15) Can't we have a gpg library?
+
+    This has been frequently requested. However, the current viewpoint
+    of the GnuPG maintainers is that this would lead to several security
+    issues and will therefore not be implemented in the foreseeable
+    future. However, for some areas of areas of application gpgme could
+    do the trick. You'll find it at 
+    ftp://ftp.guug.de/pub/gcrypt/alpha/gpgme
 
 5. COMPATIBILITY ISSUES 
 
 
-5.1) How can I encrypt a message so that PGP 2.x is able to decrypt it?
+5.1) How can I encrypt a message with GnuPG so that PGP is able to decrypt it?
+
+    It depends on the PGP version.
+
+     PGP 2.x 
 
     You can't do that because PGP 2.x normally uses IDEA which is not
-    supported by GnuPG because it is patented (see 3.3), but if you
+    supported by GnuPG as it is patented (see 3.3), but if you
     have a modified version of PGP you can try this:
 
      gpg --rfc1991 --cipher-algo 3des ...  
 
-    Please don't pipe the data to encrypt to gpg but give it as a
+    Please don't pipe the data to encrypt to gpg but provide it using a
     filename; otherwise, PGP 2 will not be able to handle it.
 
+    As for conventional encryption, you can't do this for PGP 2.  
+
+
+     PGP 5.x and higher
+
+    You need to provide two additional options: 
+    --compress-algo 1 --cipher-algo cast5  
+
+    You may also use "3des" instead of "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.
+
+    This applies to conventional encryption as well.
+
 5.2) How do I migrate from PGP 2.x to GnuPG?
 
     PGP 2 uses the RSA and IDEA encryption algorithms. Whereas the RSA
@@ -393,21 +484,12 @@
     may use IDEA even today. In that case, you may refer to Question
     3.3 about how to add IDEA support to GnuPG and read
     http://www.gnupg.org/gph/en/pgp2x.html
-    to perfrom the migration. 
-
+    to perform the migration. 
 
-5.3) How can I conventional encrypt a message, so that PGP can decrypt
-it?
 
-    You can't do this for PGP 2.  For PGP 5 you should use this: 
-
-    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) (removed)
 
+    (empty)
 
 5.4) Why is PGP 5.x not able to encrypt messages with some keys?
 
@@ -435,15 +517,31 @@
     where pgpkeyring is the original keyring and not the GnuPG one you
     might have created in the first step.
 
-5.7) PGP 5.x, 6.x do not like my secret key.
+5.7) PGP does not like my secret key.
 
-    PGP probably bails out on some private comment packets used by
+    Older PGPs probably bail 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 
+     $ gpg --export-secret-keys --no-comment -a your-key-id 
+
+    Another possibility is this: by default, GnuPG encrypts your secret
+    key using the Blowfish symmetric algorithm. Older PGPs will only
+    understand 3DES, CAST5, or IDEA symmetric algorithms. Using the
+    following method you can re-encrypt your secret gpg key with a
+    different algo:
+
+     $ gpg --s2k-cipher-algo=CAST5 --s2k-digest-algo=SHA1 \
+          --compress-algo=1  --edit-key <username>
+
+    Then use passwd to change the password (just change it to the same
+    thing, but it will encrypt the key with CAST5 this time).
 
+    Now you can export it and PGP should be able to handle it.
 
+    For PGP 6.x the following options work to export a key:
+     $ gpg --s2k-cipher-algo 3des --compress-algo 1 --rfc1991 \
+           --export-secret-keys <Key-ID>
 
 6. PROBLEMS and ERROR MESSAGES
 
@@ -451,17 +549,37 @@
 
     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
+    memory pages prevents the operating system from writing them
     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.
 
+    On UnixWare 2.x and 7.x you should install GnuPG with the
+    'plock' privilege to get the same effect:
+	filepriv -f plock /path/to/gpg
+
     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.
+    no-secmem-warning  in your ~/.gnupg/options file (this
+    disables the warning).
+
+    On some systems (e.g., Windows) GnuPG does not lock memory pages
+    and older GnuPG versions (<=1.0.4) issue the warning
+    gpg: Please note that you don't have secure memory
+    This warning can't be switched off by the above option because it
+    was thought to be a too serious issue. However, it confused users
+    too much so the warning was eventually removed.
+
+6.2) Large File Support doesn't work ..
+
+    LFS is correctly working in post-1.0.4 CVS. If configure doesn't
+    detect it correctly, try a different (i.e., better) compiler. egcs
+    1.1.2 works fine, other gccs sometimes don't. BTW, several
+    compilation problems of GnuPG 1.0.3 and 1.0.4 on HP-UX and Solaris
+    were due to broken LFS support.
 
-6.2) In the edit menu the trust values is not displayed correctly after
+6.3) 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
@@ -469,16 +587,27 @@
     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 ...
+6.4) What does "skipping pubkey 1: already loaded" mean?
+
+    As of GnuPG 1.0.3, the RSA algorithm is included. If you still have
+    a "load-extension rsa" in your .options files, the above message
+    occurs. Just remove the load command from the .options file.
+
+6.5) GnuPG 1.0.4 doesn't create ~/.gnupg ...
+
+    That's a known bug, already fixed in the CVS (and will be in the
+    next release, of course).
+
+6.6) 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
+6.7) 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 
+6.8) When I use --clearsign, the plain text has sometimes extra dashes 
 in it - why?
 
     This is called dash-escaped text and required by OpenPGP.
@@ -491,16 +620,74 @@
     Good mail clients remove those extra dashes when displaying such a 
     message.      
 
-6.6) What is the thing with "can't handle multiple signatures"?
+6.9) What is the thing with "can't handle multiple signatures"?
 
     Due to different message formats GnuPG is not always able to split a
-    file with multiple signatures unambiguously into it's parts.  This 
+    file with multiple signatures unambiguously into its parts.  This
     error message informs you that there is something wrong with the input.
 
     The only way to have multiple signatures in a file is by using the 
     OpenPGP format with one-pass-signature packets (which is GnuPG's
     default) or the cleartext signed format.
 
+6.10) If I submit a key to a keyserver, nothing happens ...
+
+    You are most likely using GnuPG on Windows 1.0.2 or older. That's
+    feature isn't yet implemented, but it's a bug not to say it. Newer
+    versions issue a warning. Upgrade to 1.0.4 or newer.
+
+6.11) I get "gpg: waiting for lock ..."
+
+    A previous gpg has most likely exited abnormally and left a lock
+    file. Go to ~/.gnupg and look for .*.lock files and remove them.
+
+6.12) Older gpg's (e.g., 1.0) have problems with keys from newer gpgs ...
+
+    As of 1.0.3, keys generated with gpg are created with preferences to
+    TWOFISH (and AES since 1.0.4) and that also means that they have the
+    capability to use the new MDC encryption method.  This will go into
+    OpenPGP soon and is also suppoted by PGP 7.  This new method avoids
+    a (not so new) attack on all email encryption systems.
+
+    This in turn means that pre-1.0.3 gpg's have problems with newer
+    key. Because of security fixes, you should keep your gpg
+    installation in a recent state anyway. As a workaround, you can
+    force gpg to use a previous default cipher algo by putting 
+    cipher-algo cast5 into your options file.
+
+6.13) With 1.0.4, I get "this cipher algorithm is deprecated ..."
+
+    If you just generated a new key and get this message while
+    encrypting, you've witnessed a bug in 1.0.4. It uses the new AES
+    cipher Rijndael that is incorrectly being referred as
+    "deprecated". Ignore this warning, more recent versions of gpg are
+    corrected.
+
+6.14) Some dates are displayed as ????-??-??, why?
+
+    Due to constraints in most libc implementations, dates beyond
+    2038-01-19 can't be displayed correctly. 64 bit OSes are not
+    affected by this problem.  To avoid printing wrong dates, GnuPG
+    instead prints some question marks.  To see the correct value, you
+    can use the options --with-colons and --fixed-list-mode.
+
+6.15) I still have a problem. How do I report a bug?
+
+    Are you sure that it's not been mentioned somewhere on the mailing
+    lists? Did you have a look at the bug list (You'll find a link to
+    the list of reported bugs on the documentation page). If you're not
+    sure about it being a bug, you can send mail to the gnupg-devel
+    list. Otherwise, use the GUUG bug tracking system 
+    http://bugs.guug.de/Reporting.html.   
+
+6.16) Why doesn't GnuPG support X509 certificates?
+
+    GnuPG, first and foremost, is an implementation of the OpenPGP
+    standard (RFC 2440), which is a competing infrastructure, different
+    from X509.
+
+    They are both public-key cryptosystems, but how the public keys are
+    actually handled is different.
 
 7. ADVANCED TOPICS
 
@@ -664,6 +851,36 @@
     algorithm to use.
 
 
+7.7) What is the list of preferred algorithms?
+
+    The list of preferred algorithms is a list of cypher, hash and
+    compression algorithms stored in the self-signature of a key during
+    key generation. When you encrypt a document, GnuPG uses this list
+    (which is then part of a public key) to determine which algorithms
+    to use. Basically it tells other people what algorithms the
+    recipient is able to handle and provides an order of preference.
+
+7.8) How do I change the list of preferred algorithms?
+
+    Currently the default is hard-wired into the GnuPG source code.
+    You'll have to change g10/keygen.c and recompile. The
+    function you'll have to change is keygen_add_std_prefs.  
+    The code is pretty self-explanatory. The constants used to
+    denote the algorithms are defined in include/cipher.h.
+
+    After having done that, generate a new key pair (or a new encryption
+    subkey) with the modified executable. This new key will have the
+    modified preferences and can then be used with unmodified executables.
+
+    To modify the preferences of an existing key, use a modified
+    executable (see above) to change the expiry date and then save the
+    key. The use your original expiry date and save the key again. Now
+    you've got the prefs changed and can use the key again with your
+    unmodified executable.
+
+    Changing the list of preferences with an unmodified GnuPG
+    executable (possibly in the edit-key menu) is on the TODO list and
+    planned for future releases.
 
 
 8. ACKNOWLEDGEMENTS
diff -urN gnupg-1.0.4/doc/HACKING gnupg-1.0.5/doc/HACKING
--- gnupg-1.0.4/doc/HACKING	Wed May 17 10:52:29 2000
+++ gnupg-1.0.5/doc/HACKING	Tue Apr 17 12:37:05 2001
@@ -10,12 +10,13 @@
 ==========
 Anonymous read-only CVS access is available:
 
-  cvs -z6 -d :pserver:anonymous@cvs.guug.de:/home/koch/cvs login
+  cvs -z3 -d :pserver:anoncvs@cvs.gnupg.org:/cvs/gnupg login
 
-use the password "anonymous".  To check out the the complete
+use the password "anoncvs".  To check out the the complete
 archive use:
 
-  cvs -z6 -d :pserver:anonymous@cvs.guug.de:/home/koch/cvs checkout gnupg
+  cvs -z3 -d :pserver:anoncvs@cvs.gnupg.org:/cvs/gnupg \
+        checkout -R STABLE-BRANCH-1-0 gnupg
 
 This service is provided to help you in hunting bugs and not to deliver
 stable snapshots; it may happen that it even does not compile, so please
@@ -117,46 +118,48 @@
 g10/g10.c	Main module with option parsing and all the stuff you have
 		to do on startup.  Also has the exout handler and some
 		helper functions.
-g10/sign.c
+g10/sign.c      Create signature and optionally encrypt
 
 g10/parse-packet.c
 g10/build-packet.c
 g10/free-packet.c
 		Parsing and creating of OpenPGP message packets.
 
-g10/getkey.c
-g10/pkclist.c
-g10/skclist.c
-g10/ringedit.c
+g10/getkey.c    Key selection code
+g10/pkclist.c   Build a list of public keys
+g10/skclist.c   Build a list of secret keys
+g10/ringedit.c  Keyring I/O
 g10/keydb.h
 
 g10/keyid.c	Helper functions to get the keyid, fingerprint etc.
 
 
-g10/trustdb.c
+g10/trustdb.c    
 g10/trustdb.h
 g10/tdbdump.c
+               Management of the trustdb.gpg
 
-g10/compress.c
-g10/filter.h
-g10/delkey.c
-g10/kbnode.c
-g10/main.h
-g10/mainproc.c
-g10/armor.c
-g10/mdfilter.c
-g10/textfilter.c
-g10/cipher.c
-g10/misc.c
-g10/options.h
-g10/openfile.c
-g10/tdbio.c
+g10/compress.c Filter to handle compression
+g10/filter.h   Declarations for all filter functions
+g10/delkey.c   Delete a key
+g10/kbnode.c   Helper for the KBNODE linked list
+g10/main.h     Prototypes and some constants
+g10/mainproc.c Message processing
+g10/armor.c    Ascii armor filter 
+g10/mdfilter.c Filter to calculate hashs
+g10/textfilter.c Filter to handle CR/LF and trailing white space
+g10/cipher.c   En-/Decryption filter
+g10/misc.c     Utlity functions
+g10/options.h  Structure with all the command line options
+               and related constants
+g10/openfile.c Create/Open Files
+g10/tdbio.c    I/O handling for the trustdb.gpg
 g10/tdbio.h
-g10/hkp.h
+g10/hkp.h      Keyserver access
 g10/hkp.c
-g10/packet.h
-g10/passphrase.c
-g10/pubkey-enc.c
+g10/packet.h   Defintion of OpenPGP structures.
+g10/passphrase.c  Passphrase handling code
+g10/pubkey-enc.c  
 g10/seckey-cert.c
 g10/seskey.c
 g10/import.c
diff -urN gnupg-1.0.4/doc/Makefile.am gnupg-1.0.5/doc/Makefile.am
--- gnupg-1.0.4/doc/Makefile.am	Wed Oct  4 15:32:33 2000
+++ gnupg-1.0.5/doc/Makefile.am	Tue Apr 17 18:21:48 2001
@@ -1,16 +1,59 @@
+# Copyright (C) 1998, 1999, 2000, 2001 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
+
 ## Process this file with automake to create Makefile.in
 
+AUTOMAKE_OPTIONS = no-texinfo.tex
+
 EXTRA_DIST = DETAILS gpg.sgml gpg.1 gpgv.sgml gpgv.1 faq.raw FAQ faq.html \
              HACKING OpenPGP README.W32 
 
 man_MANS = gpg.1 gpgv.1
 
+info_TEXINFOS = gpg.texi gpgv.texi
+
+# Need this to avoid building of dvis with automake 1.4
+DVIS =
+
 pkgdata_DATA = FAQ faq.html
 
-BUILT_SOURCES = FAQ faq.html
+BUILT_SOURCES = FAQ faq.html 
+# we can't add gpg.texi gpgv.texi here because automake does not like them to
+# be built files. 
 
-CLEANFILES = faq.raw.xref
+CLEANFILES = faq.raw.xref gpg.xml gpgv.xml
+
+
+%.texi : %.xml
+if HAVE_DOCBOOK_TO_TEXI
+	docbook2texi $< | sed 's,--,---,' >$@
+else
+	: Warning: missing docbook to texinfo tools, cannot make $@
+	touch $@
+endif
 
+%.xml : %.sgml
+if HAVE_DOCBOOK_TO_TEXI
+	sgml2xml -x lower $< >$@
+else
+	: Warning: missing docbook to texinfo tools, cannot make $@
+	touch $@
+endif
 
 
 %.1 : %.sgml
@@ -28,16 +71,6 @@
 
 faq.html : faq.raw
 	$(FAQPROG) -h -f $< $@ 2>&1 || $(FAQPROG) -h -f $< $@
-
-%.dvi: %.sgml
-	db2dvi $<
-
-%.ps: %.dvi
-	dvips -o $@ $<
-
-%/%.html: %.sgml
-	-db2html $<
-
 
 dist-hook:
 	@if test `wc -c < gpg.1` -lt 200; then \
diff -urN gnupg-1.0.4/doc/Makefile.in gnupg-1.0.5/doc/Makefile.in
--- gnupg-1.0.4/doc/Makefile.in	Tue Oct 17 15:40:48 2000
+++ gnupg-1.0.5/doc/Makefile.in	Sun Apr 29 16:39:42 2001
@@ -10,6 +10,24 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+# Copyright (C) 1998, 1999, 2000, 2001 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
+
 
 SHELL = @SHELL@
 
@@ -72,6 +90,7 @@
 DATADIRNAME = @DATADIRNAME@
 DLLTOOL = @DLLTOOL@
 DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
+DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@
 DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@
 DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@
 DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@
@@ -106,19 +125,32 @@
 ZLIBS = @ZLIBS@
 l = @l@
 
+AUTOMAKE_OPTIONS = no-texinfo.tex
+
 EXTRA_DIST = DETAILS gpg.sgml gpg.1 gpgv.sgml gpgv.1 faq.raw FAQ faq.html              HACKING OpenPGP README.W32 
 
 
 man_MANS = gpg.1 gpgv.1
 
+info_TEXINFOS = gpg.texi gpgv.texi
+
+# Need this to avoid building of dvis with automake 1.4
+DVIS = 
+
 pkgdata_DATA = FAQ faq.html
 
-BUILT_SOURCES = FAQ faq.html
+BUILT_SOURCES = FAQ faq.html 
+# we can't add gpg.texi gpgv.texi here because automake does not like them to
+# be built files. 
 
-CLEANFILES = faq.raw.xref
+CLEANFILES = faq.raw.xref gpg.xml gpgv.xml
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
+TEXI2DVI = texi2dvi
+TEXINFO_TEX = $(top_srcdir)/scripts/texinfo.tex
+INFO_DEPS = gpg.info gpgv.info
+TEXINFOS = gpg.texi gpgv.texi
 man1dir = $(mandir)/man1
 MANS = $(man_MANS)
 
@@ -134,6 +166,7 @@
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
+.SUFFIXES: .dvi .info .ps .texi .texinfo .txi
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile
 
@@ -142,6 +175,129 @@
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
+gpg.info: gpg.texi
+gpg.dvi: gpg.texi
+
+
+gpgv.info: gpgv.texi
+gpgv.dvi: gpgv.texi
+
+
+DVIPS = dvips
+
+.texi.info:
+	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+	cd $(srcdir) \
+	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+
+.texi.dvi:
+	TEXINPUTS=$(top_srcdir)/scripts/texinfo.tex:$$TEXINPUTS \
+	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
+
+.texi:
+	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+	cd $(srcdir) \
+	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+
+.texinfo.info:
+	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+	cd $(srcdir) \
+	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+
+.texinfo:
+	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+	cd $(srcdir) \
+	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+
+.texinfo.dvi:
+	TEXINPUTS=$(top_srcdir)/scripts/texinfo.tex:$$TEXINPUTS \
+	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
+
+.txi.info:
+	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+	cd $(srcdir) \
+	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+
+.txi.dvi:
+	TEXINPUTS=$(top_srcdir)/scripts/texinfo.tex:$$TEXINPUTS \
+	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
+
+.txi:
+	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+	cd $(srcdir) \
+	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+.dvi.ps:
+	$(DVIPS) $< -o $@
+
+install-info-am: $(INFO_DEPS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(infodir)
+	@list='$(INFO_DEPS)'; \
+	for file in $$list; do \
+	  d=$(srcdir); \
+	  for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
+	    if test -f $$d/$$ifile; then \
+	      echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \
+	      $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \
+	    else : ; fi; \
+	  done; \
+	done
+	@$(POST_INSTALL)
+	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+	  list='$(INFO_DEPS)'; \
+	  for file in $$list; do \
+	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
+	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
+	  done; \
+	else : ; fi
+
+uninstall-info:
+	$(PRE_UNINSTALL)
+	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+	  ii=yes; \
+	else ii=; fi; \
+	list='$(INFO_DEPS)'; \
+	for file in $$list; do \
+	  test -z "$ii" \
+	    || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
+	done
+	@$(NORMAL_UNINSTALL)
+	list='$(INFO_DEPS)'; \
+	for file in $$list; do \
+	  (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \
+	done
+
+dist-info: $(INFO_DEPS)
+	list='$(INFO_DEPS)'; \
+	for base in $$list; do \
+	  d=$(srcdir); \
+	  for file in `cd $$d && eval echo $$base*`; do \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file; \
+	  done; \
+	done
+
+mostlyclean-aminfo:
+	-rm -f gpg.aux gpg.cp gpg.cps gpg.dvi gpg.fn gpg.fns gpg.ky gpg.kys \
+	  gpg.ps gpg.log gpg.pg gpg.toc gpg.tp gpg.tps gpg.vr gpg.vrs \
+	  gpg.op gpg.tr gpg.cv gpg.cn gpgv.aux gpgv.cp gpgv.cps \
+	  gpgv.dvi gpgv.fn gpgv.fns gpgv.ky gpgv.kys gpgv.ps gpgv.log \
+	  gpgv.pg gpgv.toc gpgv.tp gpgv.tps gpgv.vr gpgv.vrs gpgv.op \
+	  gpgv.tr gpgv.cv gpgv.cn
+
+clean-aminfo:
+
+distclean-aminfo:
+
+maintainer-clean-aminfo:
+	cd $(srcdir) && for i in $(INFO_DEPS); do \
+	  rm -f $$i; \
+	  if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \
+	    rm -f $$i-[0-9]*; \
+	  fi; \
+	done
+
 install-man1:
 	$(mkinstalldirs) $(DESTDIR)$(man1dir)
 	@list='$(man1_MANS)'; \
@@ -218,10 +374,11 @@
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
+	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info
 	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
-info-am:
+info-am: $(INFO_DEPS)
 info: info-am
-dvi-am:
+dvi-am: $(DVIS)
 dvi: dvi-am
 check-am: all-am
 check: check-am
@@ -230,20 +387,21 @@
 install-exec-am:
 install-exec: install-exec-am
 
-install-data-am: install-man install-pkgdataDATA
+install-data-am: install-info-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-pkgdataDATA
+uninstall-am: uninstall-info uninstall-man uninstall-pkgdataDATA
 uninstall: uninstall-am
-all-am: Makefile $(MANS) $(DATA)
+all-am: Makefile $(INFO_DEPS) $(MANS) $(DATA)
 all-redirect: all-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(pkgdatadir)
+	$(mkinstalldirs)  $(DESTDIR)$(infodir) $(DESTDIR)$(mandir)/man1 \
+		$(DESTDIR)$(pkgdatadir)
 
 
 mostlyclean-generic:
@@ -257,32 +415,45 @@
 
 maintainer-clean-generic:
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean-am:  mostlyclean-generic
+mostlyclean-am:  mostlyclean-aminfo mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am
+clean-am:  clean-aminfo clean-generic mostlyclean-am
 
 clean: clean-am
 
-distclean-am:  distclean-generic clean-am
+distclean-am:  distclean-aminfo distclean-generic clean-am
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
+maintainer-clean-am:  maintainer-clean-aminfo maintainer-clean-generic \
+		distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
 maintainer-clean: maintainer-clean-am
 
-.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
-
+.PHONY: install-info-am uninstall-info mostlyclean-aminfo \
+distclean-aminfo clean-aminfo maintainer-clean-aminfo 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
+
+
+%.texi : %.xml
+@HAVE_DOCBOOK_TO_TEXI_TRUE@	docbook2texi $< | sed 's,--,---,' >$@
+@HAVE_DOCBOOK_TO_TEXI_FALSE@	: Warning: missing docbook to texinfo tools, cannot make $@
+@HAVE_DOCBOOK_TO_TEXI_FALSE@	touch $@
+
+%.xml : %.sgml
+@HAVE_DOCBOOK_TO_TEXI_TRUE@	sgml2xml -x lower $< >$@
+@HAVE_DOCBOOK_TO_TEXI_FALSE@	: Warning: missing docbook to texinfo tools, cannot make $@
+@HAVE_DOCBOOK_TO_TEXI_FALSE@	touch $@
 
 %.1 : %.sgml
 @HAVE_DOCBOOK_TO_MAN_TRUE@	docbook-to-man $<  >$@
@@ -295,15 +466,6 @@
 
 faq.html : faq.raw
 	$(FAQPROG) -h -f $< $@ 2>&1 || $(FAQPROG) -h -f $< $@
-
-%.dvi: %.sgml
-	db2dvi $<
-
-%.ps: %.dvi
-	dvips -o $@ $<
-
-%/%.html: %.sgml
-	-db2html $<
 
 dist-hook:
 	@if test `wc -c < gpg.1` -lt 200; then \
diff -urN gnupg-1.0.4/doc/OpenPGP gnupg-1.0.5/doc/OpenPGP
--- gnupg-1.0.4/doc/OpenPGP	Fri Jan 14 18:25:57 2000
+++ gnupg-1.0.5/doc/OpenPGP	Wed Oct 18 18:45:31 2000
@@ -8,11 +8,7 @@
 
   Compatibility Notes
   ===================
-   GnuPG (>0.4.5) is in compliance with RFC2440 despite these exceptions:
-
-    * (9.1) states that RSA SHOULD be implemented.  This is not done
-      (except with an extension, usable outside the U.S.) due to
-      patent problems.
+   GnuPG (>=1.0.3) is in compliance with RFC2440 despite these exceptions:
 
     * (9.2) states that IDEA SHOULD be implemented.  This is not done
       due to patent problems.
@@ -21,7 +17,7 @@
    All MAY features are implemented with this exception:
 
     * multi-part armored messages are not supported.
-      MIME should be used instead.
+      MIME (rfc2015) should be used instead.
 
    Most of the OPTIONAL stuff is implemented.
 
diff -urN gnupg-1.0.4/doc/README.W32 gnupg-1.0.5/doc/README.W32
--- gnupg-1.0.4/doc/README.W32	Wed Jul 12 12:56:44 2000
+++ gnupg-1.0.5/doc/README.W32	Mon Apr 23 19:02:44 2001
@@ -55,29 +55,32 @@
 
 First get the source:  It is available at
 
-  ftp://ftp.gnupg.org/pub/gcrypt/gnupg/gnupg-1.0.n.tar.gz
+  ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.0.n.tar.gz
 
 or for snapshots (with a letter appended to the version number)
 
-  ftp://ftp.gnupg.org/pub/gcrypt/devel/gnupg-1.0.nx.tar.gz
+  ftp://ftp.gnupg.org/gcrypt/devel/gnupg-1.0.nx.tar.gz
 
-this is the same source as for the Unix version.
+this is the same source as for the Unix version.  If your binary
+version of GnuPG is called something like gnupg-w32-1.0.4-1.zip, you
+should find a patch file named gnupg-w32-1.0.4-1.0.4-1.diff.gz at the
+same location, which has to ne applied to the stock gpg source file.
+Instructions are at the top of this file.
 
 To build it, you need the MingW32/CPD kit, which is available at
 
-  ftp://ftp.openit.de/pub/cpd/mingw32-cpd-0.2.4.tar.gz
-  ftp://ftp.openit.de/pub/cpd/gcc-core-2.95.2.tar.gz
-  ftp://ftp.openit.de/pub/cpd/binutils-2.9.1.tar.gz
-  ftp://ftp.openit.de/pub/cpd/windows32api-0.1.2.tar.gz
+  ftp://ftp.gnupg.org/people/werner/cpd/mingw32-cpd-0.3.0.tar.gz
+  ftp://ftp.gnupg.org/people/werner/cpd/gcc-core-2.95.2.tar.gz
+  ftp://ftp.gnupg.org/people/werner/cpd/binutils-2.9.1.tar.gz
 
-gcc, binutils and windows32api are stock GNU source which are available
-at every GNU mirror.
+gcc and binutils are stock GNU source which are available
+at every GNU mirror. 
 
 After you have installed this environment you should be able to do this:
 
- $ ./configure --target=i386--mingw32
+ $ scripts/autogen.sh --build-w32
  $ make
- $ i386--mingw32-strip g10/gpg
+ $ mingw32 strip g10/gpg
  $ cp g10/gpg  /some_windows_drive/gpg.exe
 
 And everything hopefully works.
@@ -89,4 +92,6 @@
 Be the source always with you.
 
     Werner
+
+
 
diff -urN gnupg-1.0.4/doc/faq.html gnupg-1.0.5/doc/faq.html
--- gnupg-1.0.4/doc/faq.html	Tue Oct 17 15:16:57 2000
+++ gnupg-1.0.5/doc/faq.html	Fri Apr 20 20:19:40 2001
@@ -5,11 +5,11 @@
 <body bgcolor=#ffffff text=#000000 link=#1f00ff alink=#ff0000 vlink=#9900dd>
 <H1>GNUPG FREQUENTLY ASKED QUESTIONS</H1>
 <P>
-<pre>
-Version: 0.2
-Last-Modified: Oct 14, 2000
-Maintained-by: Nils Ellmenreich &lt;nils 'at' infosun.fmi.uni-passau.de&gt;
-</pre>
+<P>
+Version: 1.2<p>
+Last-Modified: Apr 4, 2001<p>
+Maintained-by: Nils Ellmenreich &lt;nils 'at' gnupg.org&gt;
+<P>
 <P>
 This is the GnuPG FAQ. The latest HTML version is available  
 <a href=http://www.gnupg.org/faq.html> here</a>.  
@@ -18,10 +18,13 @@
 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.
+Please send additions and corrections to the maintainer. It would be
+most convenient if you could provide the answer to be included
+here. Your help is very much appreciated.
+<P>
+Please, 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. In that case
+you could search in the mailing list archive.
 <P>
 <P>
 <HR>
@@ -33,7 +36,7 @@
 </a>
 <LI><a HREF=#q1.2>1.2) Is GnuPG compatible with PGP?
 </a>
-<h2><A HREF=#q2>2. SOURCES OF INFORMATION
+<h2><A HREF=#q2>2. SOURCES of INFORMATION
 </A></h2>
 <LI><a HREF=#q2.1>2.1) Where can I find more information?
 </a>
@@ -78,14 +81,17 @@
 </a>
 <LI><a HREF=#q4.13>4.13) How can I used GnuPG in an automated environment?
 </a>
+<LI><a HREF=#q4.14>4.14) Which email-client can I use with GnuPG?
+</a>
+<LI><a HREF=#q4.15>4.15) Can't we have a gpg library?
+</a>
 <h2><A HREF=#q5>5. COMPATIBILITY ISSUES 
 </A></h2>
-<LI><a HREF=#q5.1>5.1) How can I encrypt a message so that PGP 2.x is able to decrypt it?
+<LI><a HREF=#q5.1>5.1) How can I encrypt a message with GnuPG so that PGP is able to decrypt it?
 </a>
 <LI><a HREF=#q5.2>5.2) How do I migrate from PGP 2.x to GnuPG?
 </a>
-<LI><a HREF=#q5.3>5.3) How can I conventional encrypt a message, so that PGP can decrypt
-it?
+<LI><a HREF=#q5.3>5.3) (removed)
 </a>
 <LI><a HREF=#q5.4>5.4) Why is PGP 5.x not able to encrypt messages with some keys?
 </a>
@@ -93,23 +99,43 @@
 </a>
 <LI><a HREF=#q5.6>5.6) How do I transfer owner trust values from PGP to GnuPG?
 </a>
-<LI><a HREF=#q5.7>5.7) PGP 5.x, 6.x do not like my secret key.
+<LI><a HREF=#q5.7>5.7) PGP does 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
+<LI><a HREF=#q6.2>6.2) Large File Support doesn't work ..
+</a>
+<LI><a HREF=#q6.3>6.3) 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 ...
+<LI><a HREF=#q6.4>6.4) What does &quot;skipping pubkey 1: already loaded&quot; mean?
+</a>
+<LI><a HREF=#q6.5>6.5) GnuPG 1.0.4 doesn't create ~/.gnupg ...
 </a>
-<LI><a HREF=#q6.4>6.4) Old versions of GnuPG can't verify ElGamal signatures
+<LI><a HREF=#q6.6>6.6) An ElGamal signature does not verify anymore since version 1.0.2 ...
 </a>
-<LI><a HREF=#q6.5>6.5) When I use --clearsign, the plain text has sometimes extra dashes 
+<LI><a HREF=#q6.7>6.7) Old versions of GnuPG can't verify ElGamal signatures
+</a>
+<LI><a HREF=#q6.8>6.8) When I use --clearsign, the plain text has sometimes extra dashes 
 in it - why?
 </a>
-<LI><a HREF=#q6.6>6.6) What is the thing with &quot;can't handle multiple signatures&quot;?
+<LI><a HREF=#q6.9>6.9) What is the thing with &quot;can't handle multiple signatures&quot;?
+</a>
+<LI><a HREF=#q6.10>6.10) If I submit a key to a keyserver, nothing happens ...
+</a>
+<LI><a HREF=#q6.11>6.11) I get &quot;gpg: waiting for lock ...&quot;
+</a>
+<LI><a HREF=#q6.12>6.12) Older gpg's (e.g., 1.0) have problems with keys from newer gpgs ...
+</a>
+<LI><a HREF=#q6.13>6.13) With 1.0.4, I get &quot;this cipher algorithm is deprecated ...&quot;
+</a>
+<LI><a HREF=#q6.14>6.14) Some dates are displayed as ????-??-??, why?
+</a>
+<LI><a HREF=#q6.15>6.15) I still have a problem. How do I report a bug?
+</a>
+<LI><a HREF=#q6.16>6.16) Why doesn't GnuPG support X509 certificates?
 </a>
 <h2><A HREF=#q7>7. ADVANCED TOPICS
 </A></h2>
@@ -126,6 +152,10 @@
 <LI><a HREF=#q7.6>7.6) Are the header lines of a cleartext signature part of the signed
 material?
 </a>
+<LI><a HREF=#q7.7>7.7) What is the list of preferred algorithms?
+</a>
+<LI><a HREF=#q7.8>7.8) How do I change the list of preferred algorithms?
+</a>
 <h2><A HREF=#q8>8. ACKNOWLEDGEMENTS
 </A></h2>
 </menu>
@@ -157,7 +187,7 @@
 problems. See questions <a HREF=#q5.1>5.1</a>ff. for details.
 <P>
 <h2>
-<A NAME=q2>2. SOURCES OF INFORMATION
+<A NAME=q2>2. SOURCES of INFORMATION
 </A></h2>
 <P>
 <h3>
@@ -173,22 +203,31 @@
 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.
+you'll find a searchable online archive of the GnuPG mailing
+lists. Most interesting should be gnupg-users for all user-related
+issues and gnupg-devel if you want to get in touch with the
+developers.
 <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.
+documentation. In addition, search the list archive - maybe your
+question has already been discussed. This way you help people focus
+on topics that have not yet been resolved.
+<P>
+<LI> The GnuPG source distribution contains a subdirectory 
+<PRE>./doc</PRE> where some additional documentation is located
+(mainly interesting for hackers, not the casual user).
 </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
+You can download the GNU Privacy Guard from its 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>
+The current version is 1.0.4, please upgrade to this version as it
+fixes a security bug regarding the verification of multiple signatures.
 <P>
 <P>
 <h2>
@@ -201,7 +240,7 @@
 <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>
+<a href=http://www.gnupg.org/backend.html#supsys>
 http://www.gnupg.org/gnupg.html#supsys </a>.
 <P>
 <h3>
@@ -214,10 +253,13 @@
 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>.
+option <pre>--enable-static-rnd=linux</pre>. In addition, there's
+also the kernel random device by Andi Maier <a href= http://www.cosy.sbg.ac.at/~andi>
+&lt;http://www.cosy.sbg.ac.at/~andi&gt;</a>, but it's still beta. Use at
+own risk!
 <P>
 On other systems, the Entropy Gathering Daemon (EGD) is a good
-choice. It is a perl-daemon that monitors system activity nad hashes
+choice. It is a perl-daemon that monitors system activity and 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>
@@ -246,9 +288,6 @@
 load-extension idea 
 </pre>
 <P>
-The extension is not available for the Windows version of GnuPG.
-<P>
-<P>
 <h2>
 <A NAME=q4>4. USAGE
 </A></h2>
@@ -261,9 +300,20 @@
 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:
+but you should then check the fingerprint of this key:
 &quot;gpg --fingerprint --fingerprint &lt;user ID&gt;&quot;.
 <P>
+As for the key algorithms, you should stick with the default (i.e.,
+DSA signature and ElGamal encryption). A ElGamal signing key has the
+following disadvantages: the signature is larger, it is hard to
+create such a key useful for signatures which can withstand some
+real world attacks, you don't get any extra security compared to
+DSA, there might be compatibility problems with certain PGP
+versions. It has only been introduced because at the time it was
+not clear whether there is was patent on DSA.
+<P>
+<P>
+<P>
 <h3>
 <a NAME=q4.2>4.2)</a> Why does it sometimes take so long to create keys?
 </h3>
@@ -274,7 +324,7 @@
 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
+and caps lock 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>
@@ -439,8 +489,8 @@
 <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>
+<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
@@ -481,7 +531,44 @@
 turn can revoke all the subkeys installed on that machine and
 install new subkeys.  </OL>
 <P>
+<h3>
+<a NAME=q4.14>4.14)</a> Which email-client can I use with GnuPG?
+</h3>
+<P>
+Using GnuPG to encrypt email is one of the most popular
+uses. Several mail clients or mail user-agents (MUA) support GnuPG
+at varying degrees. Simplifying a bit, there are two ways a mail can
+be encrypted with GnuPG: the &quot;old style&quot; ASCII armor, i.e. plain
+text encryption, and RFC2015 style (previously PGP/MIME, now
+OpenPGP). The latter has full MIME support. Some MUAs support only
+one of them, so whichever you actually use depends on your needs as
+well as the capabilities of your addressee.
+<P>
+The following list is probably not exhaustive:
+<P>
+OpenPGP: Mutt (Unix), Emacs/Mew, Becky2 (Windows, with plugin),
+         TkRat (Unix). There is effort for a Mozilla plugin and
+	     Emacs/GNUS has support in the current CVS.
 <P>
+ASCII:   Emacs/{VM,GNUS}/MailCrypt, Mutt(Unix), Pine(Unix), and
+         probably many more.
+<P>
+A good overview of PGP-support is present at 
+<a href=http://cryptorights.org/pgp-users/pgp-mail-clients.html>http://cryptorights.org/pgp-users/pgp-mail-clients.html</a>. 
+Direct GnuPG support is not mentioned, however, it certain cases it
+may be possible to use a wrapper. 
+<P>
+<P>
+<h3>
+<a NAME=q4.15>4.15)</a> Can't we have a gpg library?
+</h3>
+<P>
+This has been frequently requested. However, the current viewpoint
+of the GnuPG maintainers is that this would lead to several security
+issues and will therefore not be implemented in the foreseeable
+future. However, for some areas of areas of application gpgme could
+do the trick. You'll find it at 
+<a href=ftp://ftp.guug.de/pub/gcrypt/alpha/gpgme>ftp://ftp.guug.de/pub/gcrypt/alpha/gpgme</a>
 <P>
 <h2>
 <A NAME=q5>5. COMPATIBILITY ISSUES 
@@ -489,18 +576,38 @@
 <P>
 <P>
 <h3>
-<a NAME=q5.1>5.1)</a> How can I encrypt a message so that PGP 2.x is able to decrypt it?
+<a NAME=q5.1>5.1)</a> How can I encrypt a message with GnuPG so that PGP is able to decrypt it?
 </h3>
 <P>
+It depends on the PGP version.<UL>
+<P>
+<LI> PGP 2.x 
+<P>
 You can't do that because PGP 2.x normally uses IDEA which is not
-supported by GnuPG because it is patented (see <a HREF=#q3.3>3.3</a>), but if you
+supported by GnuPG as it is patented (see <a HREF=#q3.3>3.3</a>), but if you
 have a modified version of PGP you can try this:
 <P>
 <pre> gpg --rfc1991 --cipher-algo 3des ...  </pre>
 <P>
-Please don't pipe the data to encrypt to gpg but give it as a
+Please don't pipe the data to encrypt to gpg but provide it using a
 filename; otherwise, PGP 2 will not be able to handle it.
 <P>
+As for conventional encryption, you can't do this for PGP 2.  
+<P>
+<P>
+<LI> PGP 5.x and higher
+<P>
+You need to provide two additional options: 
+<pre>--compress-algo 1 --cipher-algo cast5 </pre> 
+<P>
+You may also use &quot;3des&quot; instead of &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>
+This applies to conventional encryption as well.
+</UL>
+<P>
 <h3>
 <a NAME=q5.2>5.2)</a> How do I migrate from PGP 2.x to GnuPG?
 </h3>
@@ -511,25 +618,14 @@
 may use IDEA even today. In that case, you may refer to Question
 <a HREF=#q3.3>3.3</a> about how to add IDEA support to GnuPG and read
 <a href=http://www.gnupg.org/gph/en/pgp2x.html>http://www.gnupg.org/gph/en/pgp2x.html</a>
-to perfrom the migration. 
+to perform the migration. 
 <P>
 <P>
 <h3>
-<a NAME=q5.3>5.3)</a> How can I conventional encrypt a message, so that PGP can decrypt
-it?
+<a NAME=q5.3>5.3)</a> (removed)
 </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>
+(empty)
 <P>
 <h3>
 <a NAME=q5.4>5.4)</a> Why is PGP 5.x not able to encrypt messages with some keys?
@@ -566,16 +662,36 @@
 might have created in the first step.
 <P>
 <h3>
-<a NAME=q5.7>5.7)</a> PGP 5.x, 6.x do not like my secret key.
+<a NAME=q5.7>5.7)</a> PGP does not like my secret key.
 </h3>
 <P>
-PGP probably bails out on some private comment packets used by
+Older PGPs probably bail 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>
+<pre> $ gpg --export-secret-keys --no-comment -a your-key-id </pre>
+<P>
+Another possibility is this: by default, GnuPG encrypts your secret
+key using the Blowfish symmetric algorithm. Older PGPs will only
+understand 3DES, CAST5, or IDEA symmetric algorithms. Using the
+following method you can re-encrypt your secret gpg key with a
+different algo:
 <P>
+<pre>
+ $ gpg --s2k-cipher-algo=CAST5 --s2k-digest-algo=SHA1 \
+      --compress-algo=1  --edit-key &lt;username&gt;
+</pre>
 <P>
+Then use passwd to change the password (just change it to the same
+thing, but it will encrypt the key with CAST5 this time).
+<P>
+Now you can export it and PGP should be able to handle it.
+<P>
+For PGP 6.x the following options work to export a key:
+<pre>
+ $ gpg --s2k-cipher-algo 3des --compress-algo 1 --rfc1991 \
+       --export-secret-keys &lt;Key-ID&gt;
+</pre>
 <P>
 <h2>
 <A NAME=q6>6. PROBLEMS and ERROR MESSAGES
@@ -587,18 +703,44 @@
 <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
+memory pages prevents the operating system from writing them
 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>
+On UnixWare 2.x and 7.x you should install GnuPG with the
+'plock' privilege to get the same effect:
+<pre>
+	filepriv -f plock /path/to/gpg
+</pre>
+<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.
+no-secmem-warning </pre> in your ~/.gnupg/options file (this
+disables the warning).
+<P>
+On some systems (e.g., Windows) GnuPG does not lock memory pages
+and older GnuPG versions (&lt;=1.0.4) issue the warning
+<pre>
+gpg: Please note that you don't have secure memory
+</pre>
+This warning can't be switched off by the above option because it
+was thought to be a too serious issue. However, it confused users
+too much so the warning was eventually removed.
+<P>
+<h3>
+<a NAME=q6.2>6.2)</a> Large File Support doesn't work ..
+</h3>
+<P>
+LFS is correctly working in post-1.0.4 CVS. If configure doesn't
+detect it correctly, try a different (i.e., better) compiler. egcs
+1.1.2 works fine, other gccs sometimes don't. BTW, several
+compilation problems of GnuPG 1.0.3 and 1.0.4 on HP-UX and Solaris
+were due to broken LFS support.
 <P>
 <h3>
-<a NAME=q6.2>6.2)</a> In the edit menu the trust values is not displayed correctly after
+<a NAME=q6.3>6.3)</a> In the edit menu the trust values is not displayed correctly after
 signing uids - why?
 </h3>
 <P>
@@ -608,20 +750,35 @@
 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 ...
+<a NAME=q6.4>6.4)</a> What does &quot;skipping pubkey 1: already loaded&quot; mean?
+</h3>
+<P>
+As of GnuPG 1.0.3, the RSA algorithm is included. If you still have
+a &quot;load-extension rsa&quot; in your .options files, the above message
+occurs. Just remove the load command from the .options file.
+<P>
+<h3>
+<a NAME=q6.5>6.5)</a> GnuPG 1.0.4 doesn't create ~/.gnupg ...
+</h3>
+<P>
+That's a known bug, already fixed in the CVS (and will be in the
+next release, of course).
+<P>
+<h3>
+<a NAME=q6.6>6.6)</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
+<a NAME=q6.7>6.7)</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 
+<a NAME=q6.8>6.8)</a> When I use --clearsign, the plain text has sometimes extra dashes 
 in it - why?
 </h3>
 <P>
@@ -636,17 +793,90 @@
 message.      
 <P>
 <h3>
-<a NAME=q6.6>6.6)</a> What is the thing with &quot;can't handle multiple signatures&quot;?
+<a NAME=q6.9>6.9)</a> What is the thing with &quot;can't handle multiple signatures&quot;?
 </h3>
 <P>
 Due to different message formats GnuPG is not always able to split a
-file with multiple signatures unambiguously into it's parts.  This 
+file with multiple signatures unambiguously into its parts.  This
 error message informs you that there is something wrong with the input.
 <P>
 The only way to have multiple signatures in a file is by using the 
 OpenPGP format with one-pass-signature packets (which is GnuPG's
 default) or the cleartext signed format.
 <P>
+<h3>
+<a NAME=q6.10>6.10)</a> If I submit a key to a keyserver, nothing happens ...
+</h3>
+<P>
+You are most likely using GnuPG on Windows 1.0.2 or older. That's
+feature isn't yet implemented, but it's a bug not to say it. Newer
+versions issue a warning. Upgrade to 1.0.4 or newer.
+<P>
+<h3>
+<a NAME=q6.11>6.11)</a> I get &quot;gpg: waiting for lock ...&quot;
+</h3>
+<P>
+A previous gpg has most likely exited abnormally and left a lock
+file. Go to ~/.gnupg and look for .*.lock files and remove them.
+<P>
+<h3>
+<a NAME=q6.12>6.12)</a> Older gpg's (e.g., 1.0) have problems with keys from newer gpgs ...
+</h3>
+<P>
+As of 1.0.3, keys generated with gpg are created with preferences to
+TWOFISH (and AES since 1.0.4) and that also means that they have the
+capability to use the new MDC encryption method.  This will go into
+OpenPGP soon and is also suppoted by PGP 7.  This new method avoids
+a (not so new) attack on all email encryption systems.
+<P>
+This in turn means that pre-1.0.3 gpg's have problems with newer
+key. Because of security fixes, you should keep your gpg
+installation in a recent state anyway. As a workaround, you can
+force gpg to use a previous default cipher algo by putting 
+<pre>cipher-algo cast5</pre> into your options file.
+<P>
+<h3>
+<a NAME=q6.13>6.13)</a> With 1.0.4, I get &quot;this cipher algorithm is deprecated ...&quot;
+</h3>
+<P>
+If you just generated a new key and get this message while
+encrypting, you've witnessed a bug in 1.0.4. It uses the new AES
+cipher Rijndael that is incorrectly being referred as
+&quot;deprecated&quot;. Ignore this warning, more recent versions of gpg are
+corrected.
+<P>
+<h3>
+<a NAME=q6.14>6.14)</a> Some dates are displayed as ????-??-??, why?
+</h3>
+<P>
+Due to constraints in most libc implementations, dates beyond
+2038-01-19 can't be displayed correctly. 64 bit OSes are not
+affected by this problem.  To avoid printing wrong dates, GnuPG
+instead prints some question marks.  To see the correct value, you
+can use the options --with-colons and --fixed-list-mode.
+<P>
+<h3>
+<a NAME=q6.15>6.15)</a> I still have a problem. How do I report a bug?
+</h3>
+<P>
+Are you sure that it's not been mentioned somewhere on the mailing
+lists? Did you have a look at the bug list (You'll find a link to
+the list of reported bugs on the documentation page). If you're not
+sure about it being a bug, you can send mail to the gnupg-devel
+list. Otherwise, use the GUUG bug tracking system 
+<a href=http://bugs.guug.de/Reporting.html>
+http://bugs.guug.de/Reporting.html</a>.   
+<P>
+<h3>
+<a NAME=q6.16>6.16)</a> Why doesn't GnuPG support X509 certificates?
+</h3>
+<P>
+GnuPG, first and foremost, is an implementation of the OpenPGP
+standard (RFC 2440), which is a competing infrastructure, different
+from X509.
+<P>
+They are both public-key cryptosystems, but how the public keys are
+actually handled is different.
 <P>
 <h2>
 <A NAME=q7>7. ADVANCED TOPICS
@@ -830,6 +1060,40 @@
 algorithm to use.
 <P>
 <P>
+<h3>
+<a NAME=q7.7>7.7)</a> What is the list of preferred algorithms?
+</h3>
+<P>
+The list of preferred algorithms is a list of cypher, hash and
+compression algorithms stored in the self-signature of a key during
+key generation. When you encrypt a document, GnuPG uses this list
+(which is then part of a public key) to determine which algorithms
+to use. Basically it tells other people what algorithms the
+recipient is able to handle and provides an order of preference.
+<P>
+<h3>
+<a NAME=q7.8>7.8)</a> How do I change the list of preferred algorithms?
+</h3>
+<P>
+Currently the default is hard-wired into the GnuPG source code.
+You'll have to change <pre>g10/keygen.c</pre> and recompile. The
+function you'll have to change is <pre>keygen_add_std_prefs</pre>.  
+The code is pretty self-explanatory. The constants used to
+denote the algorithms are defined in <pre>include/cipher.h</pre>.
+<P>
+After having done that, generate a new key pair (or a new encryption
+subkey) with the modified executable. This new key will have the
+modified preferences and can then be used with unmodified executables.
+<P>
+To modify the preferences of an existing key, use a modified
+executable (see above) to change the expiry date and then save the
+key. The use your original expiry date and save the key again. Now
+you've got the prefs changed and can use the key again with your
+unmodified executable.
+<P>
+Changing the list of preferences with an unmodified GnuPG
+executable (possibly in the edit-key menu) is on the TODO list and
+planned for future releases.
 <P>
 <P>
 <h2>
diff -urN gnupg-1.0.4/doc/faq.raw gnupg-1.0.5/doc/faq.raw
--- gnupg-1.0.4/doc/faq.raw	Tue Oct 17 15:16:22 2000
+++ gnupg-1.0.5/doc/faq.raw	Fri Apr 20 16:13:17 2001
@@ -6,17 +6,17 @@
 ]
 [$usenetheader=
 ]
-[$maintainer=Nils Ellmenreich <nils 'at' infosun.fmi.uni-passau.de>]
+[$maintainer=Nils Ellmenreich <nils 'at' gnupg.org>]
 [$hGPG=http://www.gnupg.org]
 
 [H body bgcolor=#ffffff text=#000000 link=#1f00ff alink=#ff0000 vlink=#9900dd]
 [H H1]GNUPG FREQUENTLY ASKED QUESTIONS[H /H1]
 
-[H pre]
-Version: 0.2
-Last-Modified: Oct 14, 2000
+
+Version: 1.2[H p]
+Last-Modified: Apr 4, 2001[H p]
 Maintained-by: [$maintainer]
-[H/pre]
+
 
 This is the GnuPG FAQ. The latest HTML version is available  
 [H a href=[$hGPG]/faq.html] here[H/a].  
@@ -25,10 +25,13 @@
 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.
+Please send additions and corrections to the maintainer. It would be
+most convenient if you could provide the answer to be included
+here. Your help is very much appreciated.
+
+Please, 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. In that case
+you could search in the mailing list archive.
 
 
 [H HR]
@@ -55,7 +58,7 @@
     the OpenPGP standard. But there are some interoperability
     problems. See questions <Rcompat>ff. for details.
 
-<S> SOURCES OF INFORMATION
+<S> SOURCES of INFORMATION
 
 <Q> Where can I find more information?
 
@@ -68,20 +71,29 @@
     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.
+    you'll find a searchable online archive of the GnuPG mailing
+    lists. Most interesting should be gnupg-users for all user-related
+    issues and gnupg-devel if you want to get in touch with the
+    developers.
 
     [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.
+    documentation. In addition, search the list archive - maybe your
+    question has already been discussed. This way you help people focus
+    on topics that have not yet been resolved.
+
+    [H LI] The GnuPG source distribution contains a subdirectory 
+    [H PRE]./doc[H /PRE] where some additional documentation is located
+    (mainly interesting for hackers, not the casual user).
     [H /UL]
 
 <Q> Where do I get GnuPG?
 
-    You can download the GNU Privacy Guard from it's primary FTP server
+    You can download the GNU Privacy Guard from its 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]
-
+    The current version is 1.0.4, please upgrade to this version as it
+    fixes a security bug regarding the verification of multiple signatures.
 
 
 <S> INSTALLATION 
@@ -90,7 +102,7 @@
 
     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]
+    [H a href=http://www.gnupg.org/backend.html#supsys]
     http://www.gnupg.org/gnupg.html#supsys [H /a].
 
 <Q> Which random gatherer should I use?
@@ -101,10 +113,13 @@
     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].
+    option [H pre]--enable-static-rnd=linux[H/pre]. In addition, there's
+    also the kernel random device by Andi Maier [H a href= http://www.cosy.sbg.ac.at/~andi]
+    <http://www.cosy.sbg.ac.at/~andi>[H /a], but it's still beta. Use at
+    own risk!
 
     On other systems, the Entropy Gathering Daemon (EGD) is a good
-    choice. It is a perl-daemon that monitors system activity nad hashes
+    choice. It is a perl-daemon that monitors system activity and 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.
 
@@ -132,9 +147,6 @@
     load-extension idea 
     [H /pre]
 
-    The extension is not available for the Windows version of GnuPG.
-
-
 <S> USAGE
 
 <Q> What is the recommended key size?
@@ -143,9 +155,20 @@
     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:
+    but you should then check the fingerprint of this key:
     "gpg --fingerprint --fingerprint <user ID>".
 
+    As for the key algorithms, you should stick with the default (i.e.,
+    DSA signature and ElGamal encryption). A ElGamal signing key has the
+    following disadvantages: the signature is larger, it is hard to
+    create such a key useful for signatures which can withstand some
+    real world attacks, you don't get any extra security compared to
+    DSA, there might be compatibility problems with certain PGP
+    versions. It has only been introduced because at the time it was
+    not clear whether there is was patent on DSA.
+
+
+
 <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
@@ -154,7 +177,7 @@
     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
+    and caps lock 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).
 
@@ -301,8 +324,8 @@
 
 <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]
+    [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.
@@ -339,23 +362,76 @@
     turn can revoke all the subkeys installed on that machine and
     install new subkeys.  [H /OL]
 
+<Q> Which email-client can I use with GnuPG?
+
+    Using GnuPG to encrypt email is one of the most popular
+    uses. Several mail clients or mail user-agents (MUA) support GnuPG
+    at varying degrees. Simplifying a bit, there are two ways a mail can
+    be encrypted with GnuPG: the "old style" ASCII armor, i.e. plain
+    text encryption, and RFC2015 style (previously PGP/MIME, now
+    OpenPGP). The latter has full MIME support. Some MUAs support only
+    one of them, so whichever you actually use depends on your needs as
+    well as the capabilities of your addressee.
+
+    The following list is probably not exhaustive:
+
+    OpenPGP: Mutt (Unix), Emacs/Mew, Becky2 (Windows, with plugin),
+             TkRat (Unix). There is effort for a Mozilla plugin and
+	     Emacs/GNUS has support in the current CVS.
+    
+    ASCII:   Emacs/{VM,GNUS}/MailCrypt, Mutt(Unix), Pine(Unix), and
+             probably many more.
 
+    A good overview of PGP-support is present at 
+    [H a href=http://cryptorights.org/pgp-users/pgp-mail-clients.html]http://cryptorights.org/pgp-users/pgp-mail-clients.html[H /a]. 
+    Direct GnuPG support is not mentioned, however, it certain cases it
+    may be possible to use a wrapper. 
+
+
+<Q> Can't we have a gpg library?
+
+    This has been frequently requested. However, the current viewpoint
+    of the GnuPG maintainers is that this would lead to several security
+    issues and will therefore not be implemented in the foreseeable
+    future. However, for some areas of areas of application gpgme could
+    do the trick. You'll find it at 
+    [H a href=ftp://ftp.guug.de/pub/gcrypt/alpha/gpgme]ftp://ftp.guug.de/pub/gcrypt/alpha/gpgme[H /a]
 
 <S> COMPATIBILITY ISSUES 
 
 <Dcompat>
 
-<Q> How can I encrypt a message so that PGP 2.x is able to decrypt it?
+<Q> How can I encrypt a message with GnuPG so that PGP is able to decrypt it?
+
+    It depends on the PGP version.[H UL]
+
+    [H LI] PGP 2.x 
 
     You can't do that because PGP 2.x normally uses IDEA which is not
-    supported by GnuPG because it is patented (see <Ridea>), but if you
+    supported by GnuPG as it is patented (see <Ridea>), but if you
     have a modified version of PGP you can try this:
 
     [H pre] gpg --rfc1991 --cipher-algo 3des ...  [H/pre]
 
-    Please don't pipe the data to encrypt to gpg but give it as a
+    Please don't pipe the data to encrypt to gpg but provide it using a
     filename; otherwise, PGP 2 will not be able to handle it.
 
+    As for conventional encryption, you can't do this for PGP 2.  
+
+    
+    [H LI] PGP 5.x and higher
+
+    You need to provide two additional options: 
+    [H pre]--compress-algo 1 --cipher-algo cast5 [H/pre] 
+
+    You may also use "3des" instead of "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.
+
+    This applies to conventional encryption as well.
+    [H /UL]
+
 <Q> How do I migrate from PGP 2.x to GnuPG?
 
     PGP 2 uses the RSA and IDEA encryption algorithms. Whereas the RSA
@@ -364,23 +440,12 @@
     may use IDEA even today. In that case, you may refer to Question
     <Ridea> about how to add IDEA support to GnuPG and read
     [H a href=http://www.gnupg.org/gph/en/pgp2x.html]http://www.gnupg.org/gph/en/pgp2x.html[H /a]
-    to perfrom the migration. 
+    to perform the migration. 
     
 
-<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> (removed)
 
+    (empty)
 
 <Q> Why is PGP 5.x not able to encrypt messages with some keys?
 
@@ -410,15 +475,35 @@
     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.
+<Q> PGP does not like my secret key.
 
-    PGP probably bails out on some private comment packets used by
+    Older PGPs probably bail 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]
+    [H pre] $ gpg --export-secret-keys --no-comment -a your-key-id [H /pre]
 
+    Another possibility is this: by default, GnuPG encrypts your secret
+    key using the Blowfish symmetric algorithm. Older PGPs will only
+    understand 3DES, CAST5, or IDEA symmetric algorithms. Using the
+    following method you can re-encrypt your secret gpg key with a
+    different algo:
 
+    [H pre]
+     $ gpg --s2k-cipher-algo=CAST5 --s2k-digest-algo=SHA1 \
+          --compress-algo=1  --edit-key <username>
+    [H /pre]
+
+    Then use passwd to change the password (just change it to the same
+    thing, but it will encrypt the key with CAST5 this time).
+
+    Now you can export it and PGP should be able to handle it.
+
+    For PGP 6.x the following options work to export a key:
+    [H pre]
+     $ gpg --s2k-cipher-algo 3des --compress-algo 1 --rfc1991 \
+           --export-secret-keys <Key-ID>
+    [H /pre]
 
 <S> PROBLEMS and ERROR MESSAGES
 
@@ -426,15 +511,39 @@
 
     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
+    memory pages prevents the operating system from writing them
     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.
 
+    On UnixWare 2.x and 7.x you should install GnuPG with the
+    'plock' privilege to get the same effect:
+    [H pre]
+	filepriv -f plock /path/to/gpg
+    [H /pre]
+
     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.
+    no-secmem-warning [H /pre] in your ~/.gnupg/options file (this
+    disables the warning).
+
+    On some systems (e.g., Windows) GnuPG does not lock memory pages
+    and older GnuPG versions (<=1.0.4) issue the warning
+    [H pre]
+    gpg: Please note that you don't have secure memory
+    [H /pre]
+    This warning can't be switched off by the above option because it
+    was thought to be a too serious issue. However, it confused users
+    too much so the warning was eventually removed.
+
+<Q> Large File Support doesn't work ..
+
+    LFS is correctly working in post-1.0.4 CVS. If configure doesn't
+    detect it correctly, try a different (i.e., better) compiler. egcs
+    1.1.2 works fine, other gccs sometimes don't. BTW, several
+    compilation problems of GnuPG 1.0.3 and 1.0.4 on HP-UX and Solaris
+    were due to broken LFS support.
 
 <Q> In the edit menu the trust values is not displayed correctly after
 signing uids - why?
@@ -444,6 +553,17 @@
     save command.  This is a not easy to fix design bug which will be
     addressed in some future release.
 
+<Q> What does "skipping pubkey 1: already loaded" mean?
+
+    As of GnuPG 1.0.3, the RSA algorithm is included. If you still have
+    a "load-extension rsa" in your .options files, the above message
+    occurs. Just remove the load command from the .options file.
+
+<Q> GnuPG 1.0.4 doesn't create ~/.gnupg ...
+
+    That's a known bug, already fixed in the CVS (and will be in the
+    next release, of course).
+
 <Q> An ElGamal signature does not verify anymore since version 1.0.2 ...
 
     Use the option --emulate-md-encode-bug.
@@ -469,13 +589,72 @@
 <Q> What is the thing with "can't handle multiple signatures"?
 
     Due to different message formats GnuPG is not always able to split a
-    file with multiple signatures unambiguously into it's parts.  This 
+    file with multiple signatures unambiguously into its parts.  This
     error message informs you that there is something wrong with the input.
 
     The only way to have multiple signatures in a file is by using the 
     OpenPGP format with one-pass-signature packets (which is GnuPG's
     default) or the cleartext signed format.
 
+<Q> If I submit a key to a keyserver, nothing happens ...
+
+    You are most likely using GnuPG on Windows 1.0.2 or older. That's
+    feature isn't yet implemented, but it's a bug not to say it. Newer
+    versions issue a warning. Upgrade to 1.0.4 or newer.
+
+<Q> I get "gpg: waiting for lock ..."
+
+    A previous gpg has most likely exited abnormally and left a lock
+    file. Go to ~/.gnupg and look for .*.lock files and remove them.
+
+<Q> Older gpg's (e.g., 1.0) have problems with keys from newer gpgs ...
+
+    As of 1.0.3, keys generated with gpg are created with preferences to
+    TWOFISH (and AES since 1.0.4) and that also means that they have the
+    capability to use the new MDC encryption method.  This will go into
+    OpenPGP soon and is also suppoted by PGP 7.  This new method avoids
+    a (not so new) attack on all email encryption systems.
+    
+    This in turn means that pre-1.0.3 gpg's have problems with newer
+    key. Because of security fixes, you should keep your gpg
+    installation in a recent state anyway. As a workaround, you can
+    force gpg to use a previous default cipher algo by putting 
+    [H pre]cipher-algo cast5[H /pre] into your options file.
+
+<Q> With 1.0.4, I get "this cipher algorithm is deprecated ..."
+
+    If you just generated a new key and get this message while
+    encrypting, you've witnessed a bug in 1.0.4. It uses the new AES
+    cipher Rijndael that is incorrectly being referred as
+    "deprecated". Ignore this warning, more recent versions of gpg are
+    corrected.
+
+<Q> Some dates are displayed as ????-??-??, why?
+
+    Due to constraints in most libc implementations, dates beyond
+    2038-01-19 can't be displayed correctly. 64 bit OSes are not
+    affected by this problem.  To avoid printing wrong dates, GnuPG
+    instead prints some question marks.  To see the correct value, you
+    can use the options --with-colons and --fixed-list-mode.
+
+<Q> I still have a problem. How do I report a bug?
+
+    Are you sure that it's not been mentioned somewhere on the mailing
+    lists? Did you have a look at the bug list (You'll find a link to
+    the list of reported bugs on the documentation page). If you're not
+    sure about it being a bug, you can send mail to the gnupg-devel
+    list. Otherwise, use the GUUG bug tracking system 
+    [H a href=http://bugs.guug.de/Reporting.html]
+    http://bugs.guug.de/Reporting.html[H /a].   
+
+<Q> Why doesn't GnuPG support X509 certificates?
+
+    GnuPG, first and foremost, is an implementation of the OpenPGP
+    standard (RFC 2440), which is a competing infrastructure, different
+    from X509.
+
+    They are both public-key cryptosystems, but how the public keys are
+    actually handled is different.
 
 <S> ADVANCED TOPICS
 
@@ -645,6 +824,36 @@
     algorithm to use.
 
 
+<Q> What is the list of preferred algorithms?
+
+    The list of preferred algorithms is a list of cypher, hash and
+    compression algorithms stored in the self-signature of a key during
+    key generation. When you encrypt a document, GnuPG uses this list
+    (which is then part of a public key) to determine which algorithms
+    to use. Basically it tells other people what algorithms the
+    recipient is able to handle and provides an order of preference.
+
+<Q> How do I change the list of preferred algorithms?
+
+    Currently the default is hard-wired into the GnuPG source code.
+    You'll have to change [H pre]g10/keygen.c[H/pre] and recompile. The
+    function you'll have to change is [H pre]keygen_add_std_prefs[H /pre].  
+    The code is pretty self-explanatory. The constants used to
+    denote the algorithms are defined in [H pre]include/cipher.h[H /pre].
+
+    After having done that, generate a new key pair (or a new encryption
+    subkey) with the modified executable. This new key will have the
+    modified preferences and can then be used with unmodified executables.
+
+    To modify the preferences of an existing key, use a modified
+    executable (see above) to change the expiry date and then save the
+    key. The use your original expiry date and save the key again. Now
+    you've got the prefs changed and can use the key again with your
+    unmodified executable.
+
+    Changing the list of preferences with an unmodified GnuPG
+    executable (possibly in the edit-key menu) is on the TODO list and
+    planned for future releases.
 
 
 <S> ACKNOWLEDGEMENTS
diff -urN gnupg-1.0.4/doc/gpg.1 gnupg-1.0.5/doc/gpg.1
--- gnupg-1.0.4/doc/gpg.1	Wed Sep  6 16:38:47 2000
+++ gnupg-1.0.5/doc/gpg.1	Sat Apr 28 20:43:45 2001
@@ -67,7 +67,7 @@
 \fBgpg\fP is the main program for the GnuPG system. 
  
 .PP 
-This man page does only list the commands and options available. 
+This man page only lists the commands and options available. 
 For a more verbose documentation get the GNU Privacy Handbook (GPH), which is 
 available at http://www.gnupg.org/gph/ . 
 You will find a list of HOWTO documents at http://www.gnupg.org/docs.html . 
@@ -84,7 +84,7 @@
 .IP "-e, --encrypt" 10 
 Encrypt data. This option may be combined with --sign. 
 .IP "-c, --symmetric" 10 
-Encrypt with symmetric cipher only 
+Encrypt with symmetric cipher only. 
 This command asks for a passphrase. 
 .IP "--store" 10 
 Store only (make a simple RFC1991 packet). 
@@ -100,20 +100,21 @@
 .IP "--verify [[\fBsigfile\fR]  [\fBsigned-files\fR]]" 10 
 Assume that \fBsigfile\fR is a signature and verify it 
 without generating any output.	With no arguments, 
-the signature packet is read from stdin (it may be a 
-detached signature when not used in batch mode). If 
+the signature packet is read from stdin.  If 
 only a sigfile is given, it may be a complete 
 signature or a detached signature, in which case 
 the signed stuff is expected in a file without the 
-".sig" or ".asc" extension (if such a file does 
-not exist it is expected at stdin; use a single dash ("-") as 
-filename to force a read from stdin). With more than 
+".sig" or ".asc" extension.  
+With more than 
 1 argument, the first should be a detached signature 
-and the remaining files are the signed stuff. 
+and the remaining files are the signed stuff.  To read the signed 
+stuff from stdin, use \fB-\fP as the second filename. 
+For security reasons a detached signature cannot read the signed 
+material from stdin without denoting it in the above way. 
 .IP "--verify-files [\fBfiles\fR]" 10 
 This is a special version of the --verify command which does not work with 
-detached signatures.  The command expects the files to bee verified either 
-on the commandline or reads the filenames from stdin;  each anem muts be on 
+detached signatures.  The command expects the files to be verified either 
+on the command line or reads the filenames from stdin;  each name must be on 
 separate line. The command is intended for quick checking of many files. 
 .IP "--list-keys [\fBnames\fR]" 10 
 .IP "--list-public-keys [\fBnames\fR]" 10 
@@ -138,9 +139,9 @@
 useful for debugging. 
 .IP "--gen-key" 10 
 Generate a new key pair. This command is normally only used 
-interactive. 
+interactively. 
 .IP "" 10 
-There is an experimental feature which allows to create keys 
+There is an experimental feature which allows you to create keys 
 in batch mode. See the file \fBdoc/DETAILS\fP in the source distribution on how to use this. 
 .IP "--edit-key \fBname\fR" 10 
 Present a menu which enables you to do all key 
@@ -174,7 +175,7 @@
 .IP "adduid" 10 
 Create an alternate user id. 
 .IP "deluid" 10 
-Delete an user id. 
+Delete a user id. 
 .IP "addkey" 10 
 Add a subkey to this key. 
 .IP "delkey" 10 
@@ -198,6 +199,8 @@
 Check all selected user ids. 
 .IP "pref" 10 
 List preferences. 
+.IP "showpref" 10 
+More verbose preferences listing. 
 .IP "toggle" 10 
 Toggle between public and secret key listing. 
 .IP "save" 10 
@@ -217,7 +220,8 @@
 .IP "-" 10 
 No ownertrust assigned / not yet calculated. 
 .IP "e" 10 
-Trust calculation has failed. 
+Trust 
+calculation has failed; probably due to an expired key. 
 .IP "q" 10 
 Not enough information for calculation. 
 .IP "n" 10 
@@ -230,22 +234,24 @@
 Ultimately trusted. 
 .RE 
 .IP "--sign-key \fBname\fR" 10 
-Sign a public key with you secret key.	This is a shortcut version 
+Sign a public key with your secret key.	This is a shortcut version 
 of the subcommand "sign" from --edit. 
 .IP "--lsign-key \fBname\fR" 10 
-Sign a public key with you secret key but mark it as non-exportable. 
+Sign a public key with your 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 
+online but still want to 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 
 Remove key from the secret and public keyring 
+.IP "--delete-secret-and-public-key  \fBname\fR" 10 
+Same as --delete-key, but if a secret key exists, it will be removed first. 
 .IP "--gen-revoke" 10 
 Generate a revocation certificate for the complete key. To revoke 
 a subkey or a signature, use the --edit command. 
@@ -263,16 +269,16 @@
 to a keyserver - select only those keys which are new 
 or changed by you. 
 .IP "--export-all [\fBnames\fR]" 10 
-Same as --export, but does also export keys which 
-are not compatible to OpenPGP. 
+Same as --export, but also exports keys which 
+are not compatible with OpenPGP. 
 .IP "--export-secret-keys [\fBnames\fR]" 10 
 .IP "--export-secret-subkeys [\fBnames\fR]" 10 
-Same as --export, but does export the secret keys. 
+Same as --export, but exports the secret keys instead. 
 This is normally not very useful and a security risk. 
-the second form of the command has the special property to 
+The second form of the command has the special property to 
 render the secret part of the primary key useless; this is 
 a GNU extension to OpenPGP and other implementations can 
-not be expected to successful import such a key. 
+not be expected to successfully import such a key. 
 .IP "--import [\fBfiles\fR]" 10 
 .IP "--fast-import [\fBfiles\fR]" 10 
 Import/merge keys. This adds the given keys to the 
@@ -282,15 +288,16 @@
 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 
+Most notable here is the --merge-only option which does not insert new keys 
 but does only the merging of new signatures, user-IDs and subkeys. 
+See also the option --allow-secret-key-import. 
 .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 
 give the name of this keyserver. 
 .IP "--export-ownertrust" 10 
 List the assigned ownertrust values in ASCII format 
-for backup purposes 
+for backup purposes. 
 .IP "--import-ownertrust [\fBfiles\fR]" 10 
 Update the trustdb with the ownertrust values stored 
 in \fBfiles\fR (or stdin if not given); existing 
@@ -302,7 +309,7 @@
 .IP "--gen-random \fB0|1|2\fR 		   [\fBcount\fR]" 10 
 Emit COUNT random bytes of the given quality level. If count is not given 
 or zero, an endless sequence of random bytes will be emitted. 
-PLEASE, don't use this command unless you know what you are doing, it may 
+PLEASE, don't use this command unless you know what you are doing; it may 
 remove precious entropy from the system! 
 .IP "--gen-prime \fBmode\fR 		  \fBbits\fR 		   [\fBqbits\fR]" 10 
 Use the source, Luke :-). The output format is still subject to change. 
@@ -312,8 +319,8 @@
 .IP "--warranty" 10 
 Print warranty information. 
 .IP "-h, --help" 10 
-Print usage information.  This is a really long list even it does list 
-not all options. 
+Print usage information.  This is a really long list even though it doesn't list 
+all options. 
 .SH "OPTIONS" 
 .PP 
 Long options can be put in an options file (default "~/.gnupg/options"). 
@@ -341,7 +348,7 @@
 specified, GnuPG asks for the user-id unless --default-recipient is given 
 .IP "--default-recipient \fBname\fR" 10 
 Use \fBname\fR as default recipient if option --recipient is not used and 
-don't ask if this is a valid one. \fBname\fR must be a non empty. 
+don't ask if this is a valid one. \fBname\fR must be non-empty. 
 .IP "--default-recipient-self" 10 
 Use the default key as default recipient if option --recipient is not used and 
 don't ask if this is a valid one. The default key is the first one from the 
@@ -349,9 +356,9 @@
 .IP "--no-default-recipient" 10 
 Reset --default-recipient and --default-recipient-self. 
 .IP "--encrypt-to \fBname\fR" 10 
-Same as --recipient but this one is intended for 
-in the options file and may be used together with 
-an own user-id as an "encrypt-to-self".  These keys 
+Same as --recipient but this one is intended for use 
+in the options file and may be used with 
+your own user-id as an "encrypt-to-self".  These keys 
 are only used when there are other recipients given 
 either by use of --recipient or by the asked user id. 
 No trust checking is performed for these user ids and 
@@ -383,7 +390,7 @@
 .IP "--no-tty" 10 
 Make sure that the TTY (terminal) is never used for any output. 
 This option is needed in some cases because GnuPG sometimes prints 
-warnings to the TTY if if --batch is used. 
+warnings to the TTY if --batch is used. 
 .IP "--no-batch" 10 
 Disable batch mode.  This may be of use if --batch 
 is enabled from an options file. 
@@ -409,8 +416,8 @@
 that you get different key servers. 
 .IP "--no-auto-key-retrieve" 10 
 This option disables the automatic retrieving of keys from a keyserver 
-while verifying signatures. This option allows to keep a keyserver in 
-the options file or the --send-keys and --recv-keys commands. 
+while verifying signatures. This option allows you to keep a keyserver in 
+the options file for the --send-keys and --recv-keys commands. 
 .IP "--honor-http-proxy" 10 
 Try to access the keyserver over the proxy set with the variable 
 "http_proxy". 
@@ -446,14 +453,17 @@
 The Latin 2 set. 
 .IP "koi8-r" 10 
 The usual Russian set (rfc1489). 
+.IP "utf-8" 10 
+Bypass all translations and assume 
+that the OS uses native UTF-8 encoding. 
 .RE 
 .IP "--utf8-strings" 10 
 .IP "--no-utf8-strings" 10 
 Assume that the arguments are already given as UTF8 strings.  The default 
 (--no-utf8-strings) 
 is to assume that arguments are encoded in the character set as specified 
-by --charset. These options effects all following arguments.  Both options may 
-used multiple times. 
+by --charset. These options affect all following arguments.  Both options may 
+be used multiple times. 
 .IP "--options \fBfile\fR" 10 
 Read options from \fBfile\fR and do not try to read 
 them from the default options file in the homedir 
@@ -495,10 +505,10 @@
 --no-version from a config file. 
 .IP "-N, --notation-data \fBname=value\fR" 10 
 Put the name value pair into the signature as notation data. 
-\fBname\fR must consists only of alphanumeric characters, digits 
+\fBname\fR must consist only of alphanumeric characters, digits 
 or the underscore; the first character must not be a digit. 
-\fBvalue\fR may be any printable string; it will encoded in UTF8, 
-so sou should have check that your --charset is set right. 
+\fBvalue\fR may be any printable string; it will be encoded in UTF8, 
+so you should check that your --charset is set correctly. 
 If you prefix \fBname\fR with an exclamation mark, the notation 
 data will be flagged as critical (rfc2440:5.2.3.15). 
 .IP "--set-policy-url \fBstring\fR" 10 
@@ -564,6 +574,20 @@
 Never allow the use of \fBname\fR as public key algorithm. 
 The given name will not be checked so that a later loaded algorithm 
 will still get disabled. 
+.IP "--no-sig-cache" 10 
+Do not cache the verification status of key signatures. 
+Caching gives a much better performance in key listings.  However, if 
+you suspect that your public keyring is not save against write 
+modifications, you can use this option to disable the caching.  It 
+probably does not make sense to disable it because all kind of damage 
+can be done if someone else has write access to your public keyring. 
+.IP "--no-sig-create-check" 10 
+GnuPG normally verifies each signature right after creation to protect 
+against bugs and hardware malfunctions which could leak out bits from 
+the secret key.  This extra verification needs some time (about 115% 
+for DSA keys), and so this option can be used to disable it. 
+However, due to the fact that the signature creation needs manual 
+interaction, this performance penalty does not matter in most settings. 
 .IP "--throw-keyid" 10 
 Do not put the keyid into encrypted packets.  This option 
 hides the receiver of the message and is a countermeasure 
@@ -589,11 +613,15 @@
 can only be used if only one passphrase is supplied. 
 Don't use this option if you can avoid it. 
 .IP "--command-fd \fBn\fR" 10 
-This is a replacement for the depreciated shared-memory IPC mode. 
+This is a replacement for the deprecated shared-memory IPC mode. 
 If this option is enabled, user input on questions is not expected 
 from the TTY but from the given file descriptor.  It should be used 
 together with --status-fd. See the file doc/DETAILS in the source 
 distribution for details on how to use it. 
+.IP "--use-agent" 10 
+Try to use the GnuPG-Agent. Please note that this agent is still under 
+development.  With this option, GnuPG first tries to connect to the 
+agent before it asks for a passphrase. 
 .IP "--rfc1991" 10 
 Try to be more RFC1991 (PGP 2.x) compliant. 
 .IP "--openpgp" 10 
@@ -606,16 +634,17 @@
 .IP "--force-v3-sigs" 10 
 OpenPGP states that an implementation should generate 
 v4 signatures but PGP 5.x recognizes v4 signatures only 
-on key material.  This options forces v3 signatures for 
+on key material.  This option forces v3 signatures for 
 signatures on data. 
 .IP "--force-mdc" 10 
 Force the use of encryption with appended manipulation 
-code.  This is always used with the newer cipher (those 
+code.  This is always used with the newer ciphers (those 
 with a blocksize greater than 64 bit). 
 This option might not be implemented yet. 
 .IP "--allow-non-selfsigned-uid" 10 
-Allow the import of keys with user IDs which are not self-signed. 
-This is only allows the import - key validation will fail and you 
+Allow the import of keys with user IDs which are not self-signed, but 
+have at least one signature. 
+This only allows the import - key validation will fail and you 
 have to check the validity of the key my other means.  This hack is 
 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 
@@ -629,6 +658,13 @@
 signatures have plausible values.  However, sometimes a signature seems to 
 be older than the key due to clock problems.  This option makes these 
 checks just a warning. 
+.IP "--ignore-crc-error" 10 
+The ASCII armor used by OpenPG is protected by a CRC checksum against 
+transmission errors.  Sometimes it happens that the CRC gets mangled 
+somewhere on the transmission channel  
+but the actual content (which is anyway protected by 
+the OpenPGP protocol) is still okay.  This option will let gpg ignore 
+CRC errors. 
 .IP "--lock-once" 10 
 Lock the databases the first time a lock is requested 
 and do not release the lock until the process 
@@ -640,13 +676,13 @@
 .IP "--lock-never" 10 
 Disable locking entirely.  This option should be used only in very 
 special environments, where it can be assured that only one process 
-is accessing those files.  A bootable floppy with a standalone 
+is accessing those files.  A bootable floppy with a stand-alone 
 encryption system will probably use this.  Improper usage of this 
 option may lead to data and key corruption. 
 .IP "--no-random-seed-file" 10 
-GnuPG uses a file to store it's internal random pool over invocations. 
+GnuPG uses a file to store its internal random pool over invocations. 
 This makes random generation faster; however sometimes write operations 
-are not desired.  This option can be used to achive that with the cost of 
+are not desired.  This option can be used to achieve that with the cost of 
 slower random generation. 
 .IP "--no-verbose" 10 
 Reset verbose level to 0. 
@@ -675,19 +711,22 @@
 Changes the output of the list commands to work faster; this is achieved 
 by leaving some parts empty.  Some applications don't need the user ID and 
 the trust information given in the listings.  By using this options they 
-can get a faster listing.  The excact behaviour of this option may change 
+can get a faster listing.  The exact behaviour of this option may change 
 in future versions. 
+.IP "--fixed-list-mode" 10 
+Do not merge user ID and primary key in --with-colon listing mode and 
+print all timestamps as seconds since 1970-01-01. 
 .IP "--list-only" 10 
 Changes the behaviour of some commands.  This is like --dry-run but 
 different in some cases.  The semantic of this command may be extended in 
-the future.  Currently it does only skip the actual decryption pass and 
+the future.  Currently it only skips the actual decryption pass and 
 therefore enables a fast listing of the encryption keys. 
 .IP "--no-literal" 10 
 This is not for normal use.  Use the source to see for what it might be useful. 
 .IP "--set-filesize" 10 
 This is not for normal use.  Use the source to see for what it might be useful. 
 .IP "--emulate-md-encode-bug" 10 
-GnuPG versions prior to 1.0.2 had a bug in the way a signature was encode. 
+GnuPG versions prior to 1.0.2 had a bug in the way a signature was encoded. 
 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. 
@@ -707,18 +746,27 @@
 handing out the secret key. 
 .IP "--merge-only" 10 
 Don't insert new keys into the keyrings while doing an import. 
+.IP "--allow-secret-key-import" 10 
+Allow import of secret keys.  The import command normally skips secret 
+keys because a secret key can otherwise be used to attack the trust 
+calculation. 
 .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. 
+.IP "--enable-special-filenames" 10 
+This options enables a mode in which filenames of the form 
+\fB-&n\fP, where n is a non-negative decimal number, 
+refer to the file descriptor n and not to a file with that name. 
+.IP "--no-expensive-trust-checks" 10 
+Experimental use only. 
 .SH "How to specify a user ID" 
 .PP 
 There are different ways on how to specify a user ID to GnuPG; 
 here are some examples: 
  
 .IP "" 10 
-Used to locate the default home directory. 
 .IP "234567C4" 10 
 .IP "0F34E556E" 10 
 .IP "01347A56A" 10 
@@ -753,8 +801,14 @@
 .IP "Heine" 10 
 .IP "*Heine" 10 
 By case insensitive substring matching.  This is the default mode but 
-applications may want to explicitely indicate this by putting the asterisk 
+applications may want to explicitly indicate this by putting the asterisk 
 in front. 
+.PP 
+Note that you can append an exclamation mark to key IDs or 
+fingerprints.  This flag which tells GnuPG to use exactly 
+that primary or secondary key and don't try to figure out which  
+secondary or primary key to use. 
+ 
 .SH "RETURN VALUE" 
 .PP 
 The program returns 0 if everything was fine, 1 if at least 
@@ -817,12 +871,16 @@
 .PP 
 Keep in mind that, if this program is used over a network (telnet), it 
 is *very* easy to spy out your passphrase! 
+.PP 
+If you are going to verify detached signatures, make sure that the 
+program nows about it; either be giving both filenames on the 
+commandline or using \fB-\fP to specify stdin. 
 .SH "BUGS" 
 .PP 
 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. If you get no 
-warning message about insecure memory 3our operating system supports 
+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. 
-...\" created by instant / docbook-to-man, Wed 06 Sep 2000, 16:38 
+...\" created by instant / docbook-to-man, Sat 28 Apr 2001, 20:43 
diff -urN gnupg-1.0.4/doc/gpg.info gnupg-1.0.5/doc/gpg.info
--- gnupg-1.0.4/doc/gpg.info	Thu Jan  1 01:00:00 1970
+++ gnupg-1.0.5/doc/gpg.info	Sat Apr 28 20:45:54 2001
@@ -0,0 +1,1024 @@
+This is gpg.info, produced by makeinfo version 4.0 from gpg.texi.
+
+
+File: gpg.info,  Node: Top,  Up: (dir)
+
+gpg
+***
+
+* Menu:
+
+Name
+****
+
+   gpg --- encryption and signing tool
+
+Synopsis
+********
+
+DESCRIPTION
+***********
+
+   `gpg' is the main program for the GnuPG system.
+
+   This man page only lists the commands and options available.  For a
+more verbose documentation get the GNU Privacy Handbook (GPH), which is
+available at http://www.gnupg.org/gph/ .  You will find a list of HOWTO
+documents at http://www.gnupg.org/docs.html .
+
+COMMANDS
+********
+
+   `gpg' recognizes these commands:
+
+-s, --sign
+     Make a signature. This command may be combined with --encrypt.
+
+--clearsign
+     Make a clear text signature.
+
+-b, --detach-sign
+     Make a detached signature.
+
+-e, --encrypt
+     Encrypt data. This option may be combined with --sign.
+
+-c, --symmetric
+     Encrypt with symmetric cipher only.  This command asks for a
+     passphrase.
+
+--store
+     Store only (make a simple RFC1991 packet).
+
+--decrypt `file'
+     Decrypt `file' (or stdin if no file is specified) and write it to
+     stdout (or the file specified with --output). If the decrypted
+     file is signed, the signature is also verified. This command
+     differs from the default operation, as it never writes to the
+     filename which is included in the file and it rejects files which
+     don't begin with an encrypted message.
+
+--verify `sigfile' `signed-files'
+     Assume that `sigfile' is a signature and verify it without
+     generating any output. With no arguments, the signature packet is
+     read from stdin. If only a sigfile is given, it may be a complete
+     signature or a detached signature, in which case the signed stuff
+     is expected in a file without the ".sig" or ".asc" extension.
+     With more than 1 argument, the first should be a detached signature
+     and the remaining files are the signed stuff. To read the signed
+     stuff from stdin, use `-' as the second filename.  For security
+     reasons a detached signature cannot read the signed material from
+     stdin without denoting it in the above way.
+
+--verify-files `files'
+     This is a special version of the --verify command which does not
+     work with detached signatures. The command expects the files to be
+     verified either on the command line or reads the filenames from
+     stdin; each name must be on separate line. The command is intended
+     for quick checking of many files.
+
+--list-keys `names'
+--list-public-keys `names'
+     List all keys from the public keyrings, or just the ones given on
+     the command line.
+
+--list-secret-keys `names'
+     List all keys from the secret keyrings, or just the ones given on
+     the command line.
+
+--list-sigs `names'
+     Same as --list-keys, but the signatures are listed too.
+
+--check-sigs `names'
+     Same as --list-sigs, but the signatures are verified.
+
+--fingerprint `names'
+     List all keys with their fingerprints. This is the same output as
+     --list-keys but with the additional output of a line with the
+     fingerprint. May also be combined with --list-sigs or -check-sigs.
+     If this command is given twice, the fingerprints of all secondary
+     keys are listed too.
+
+--list-packets
+     List only the sequence of packets. This is mainly useful for
+     debugging.
+
+--gen-key
+     Generate a new key pair. This command is normally only used
+     interactively.
+
+     There is an experimental feature which allows you to create keys
+     in batch mode. See the file `doc/DETAILS' in the source
+     distribution on how to use this.
+
+--edit-key `name'
+     Present a menu which enables you to do all key related tasks:
+
+    sign
+          Make a signature on key of user `name' If the key is not yet
+          signed by the default user (or the users given with -u), the
+          program displays the information of the key again, together
+          with its fingerprint and asks whether it should be signed.
+          This question is repeated for all users specified with -u.
+
+    lsign
+          Same as --sign but the signature is marked as non-exportable
+          and will therefore never be used by others. This may be used
+          to make keys valid only in the local environment.
+
+    revsig
+          Revoke a signature. GnuPG asks for every signature which has
+          been done by one of the secret keys, whether a revocation
+          certificate should be generated.
+
+    trust
+          Change the owner trust value. This updates the trust-db
+          immediately and no save is required.
+
+    disable
+    enable
+          Disable or enable an entire key. A disabled key can normally
+          not be used for encryption.
+
+    adduid
+          Create an alternate user id.
+
+    deluid
+          Delete a user id.
+
+    addkey
+          Add a subkey to this key.
+
+    delkey
+          Remove a subkey.
+
+    revkey
+          Revoke a subkey.
+
+    expire
+          Change the key expiration time. If a key is selected, the
+          time of this key will be changed.  With no selection the key
+          expiration of the primary key is changed.
+
+    passwd
+          Change the passphrase of the secret key.
+
+    uid `n'
+          Toggle selection of user id with index `n'.  Use 0 to
+          deselect all.
+
+    key `n'
+          Toggle selection of subkey with index `n'.  Use 0 to deselect
+          all.
+
+    check
+          Check all selected user ids.
+
+    pref
+          List preferences.
+
+    showpref
+          More verbose preferences listing.
+
+    toggle
+          Toggle between public and secret key listing.
+
+    save
+          Save all changes to the key rings and quit.
+
+    quit
+          Quit the program without updating the key rings.
+
+     The listing shows you the key with its secondary keys and all user
+     ids. Selected keys or user ids are indicated by an asterisk. The
+     trust value is displayed with the primary key: the first is the
+     assigned owner trust and the second is the calculated trust value.
+     Letters are used for the values:
+
+    -
+          No ownertrust assigned / not yet calculated.
+
+    e
+          Trust calculation has failed; probably due to an expired key.
+
+    q
+          Not enough information for calculation.
+
+    n
+          Never trust this key.
+
+    m
+          Marginally trusted.
+
+    f
+          Fully trusted.
+
+    u
+          Ultimately trusted.
+
+--sign-key `name'
+     Sign a public key with your secret key. This is a shortcut version
+     of the subcommand "sign" from --edit.
+
+--lsign-key `name'
+     Sign a public key with your secret key but mark it as
+     non-exportable.  This is a shortcut version of the subcommand
+     "lsign" from --edit.
+
+--trusted-key `long key ID'
+     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 want to be able to check the
+     validity of a given recipient's or signator's key.
+
+--delete-key `name'
+     Remove key from the public keyring
+
+--delete-secret-key `name'
+     Remove key from the secret and public keyring
+
+--delete-secret-and-public-key `name'
+     Same as --delete-key, but if a secret key exists, it will be
+     removed first.
+
+--gen-revoke
+     Generate a revocation certificate for the complete key. To revoke
+     a subkey or a signature, use the --edit command.
+
+--export `names'
+     Either export all keys from all keyrings (default keyrings and
+     those registered via option --keyring), or if at least one name is
+     given, those of the given name. The new keyring is written to
+     stdout or to the file given with option "output". Use together
+     with --armor to mail those keys.
+
+--send-keys `names'
+     Same as --export but sends the keys to a keyserver.  Option
+     --keyserver must be used to give the name of this keyserver. Don't
+     send your complete keyring to a keyserver - select only those keys
+     which are new or changed by you.
+
+--export-all `names'
+     Same as --export, but also exports keys which are not compatible
+     with OpenPGP.
+
+--export-secret-keys `names'
+--export-secret-subkeys `names'
+     Same as --export, but exports the secret keys instead.  This is
+     normally not very useful and a security risk.  The second form of
+     the command has the special property to render the secret part of
+     the primary key useless; this is a GNU extension to OpenPGP and
+     other implementations can not be expected to successfully import
+     such a key.
+
+--import `files'
+--fast-import `files'
+     Import/merge keys. This adds the given keys to the keyring.  The
+     fast version does not build the trustdb; this can be done at any
+     time with the command --update-trustdb.
+
+     There are a few other options which control how this command works.
+     Most notable here is the --merge-only option which does not insert
+     new keys but does only the merging of new signatures, user-IDs and
+     subkeys.  See also the option --allow-secret-key-import.
+
+--recv-keys `key IDs'
+     Import the keys with the given key IDs from a HKP keyserver.
+     Option --keyserver must be used to give the name of this keyserver.
+
+--export-ownertrust
+     List the assigned ownertrust values in ASCII format for backup
+     purposes.
+
+--import-ownertrust `files'
+     Update the trustdb with the ownertrust values stored in `files'
+     (or stdin if not given); existing values will be overwritten.
+
+--print-md `algo' `files'
+     Print message digest of algorithm ALGO for all given files of
+     stdin.  If "*" is used for the algorithm, digests for all
+     available algorithms are printed.
+
+--gen-random `0|1|2' `count'
+     Emit COUNT random bytes of the given quality level. If count is
+     not given or zero, an endless sequence of random bytes will be
+     emitted.  PLEASE, don't use this command unless you know what you
+     are doing; it may remove precious entropy from the system!
+
+--gen-prime `mode' `bits' `qbits'
+     Use the source, Luke :-). The output format is still subject to
+     change.
+
+--version
+     Print version information along with a list of supported
+     algorithms.
+
+--warranty
+     Print warranty information.
+
+-h, --help
+     Print usage information. This is a really long list even though it
+     doesn't list all options.
+
+OPTIONS
+*******
+
+   Long options can be put in an options file (default
+"~/.gnupg/options").  Do not write the 2 dashes, but simply the name of
+the option and any required arguments. Lines with a hash as the first
+non-white-space character are ignored. Commands may be put in this file
+too, but that does not make sense.
+
+   `gpg' recognizes these options:
+
+-a, --armor
+     Create ASCII armored output.
+
+-o, --output `file'
+     Write output to `file'.
+
+-u, --local-user `name'
+     Use `name' as the user ID to sign.  This option is silently
+     ignored for the list commands, so that it can be used in an
+     options file.
+
+--default-key `name'
+     Use `name' as default user ID for signatures. If this is not used
+     the default user ID is the first user ID found in the secret
+     keyring.
+
+-r, --recipient `name'
+
+     Encrypt for user id `name'. If this option is not specified, GnuPG
+     asks for the user-id unless --default-recipient is given
+
+--default-recipient `name'
+     Use `name' as default recipient if option --recipient is not used
+     and don't ask if this is a valid one. `name' must be non-empty.
+
+--default-recipient-self
+     Use the default key as default recipient if option --recipient is
+     not used and don't ask if this is a valid one. The default key is
+     the first one from the secret keyring or the one set with
+     --default-key.
+
+--no-default-recipient
+     Reset --default-recipient and -default-recipient-self.
+
+--encrypt-to `name'
+     Same as --recipient but this one is intended for use in the
+     options file and may be used with your own user-id as an
+     "encrypt-to-self". These keys are only used when there are other
+     recipients given either by use of --recipient or by the asked user
+     id.  No trust checking is performed for these user ids and even
+     disabled keys can be used.
+
+--no-encrypt-to
+     Disable the use of all --encrypt-to keys.
+
+-v, --verbose
+     Give more information during processing. If used twice, the input
+     data is listed in detail.
+
+-q, --quiet
+     Try to be as quiet as possible.
+
+-z `n'
+     Set compression level to `n'. A value of 0 for `n' disables
+     compression. Default is to use the default compression level of
+     zlib (normally 6).
+
+-t, --textmode
+     Use canonical text mode. If -t (but not --textmode) is used
+     together with armoring and signing, this enables clearsigned
+     messages.  This kludge is needed for PGP compatibility; normally
+     you would use --sign or -clearsign to selected the type of the
+     signature.
+
+-n, --dry-run
+     Don't make any changes (this is not completely implemented).
+
+-i, --interactive
+     Prompt before overwriting any files.
+
+--batch
+     Use batch mode. Never ask, do not allow interactive commands.
+
+--no-tty
+     Make sure that the TTY (terminal) is never used for any output.
+     This option is needed in some cases because GnuPG sometimes prints
+     warnings to the TTY if --batch is used.
+
+--no-batch
+     Disable batch mode. This may be of use if --batch is enabled from
+     an options file.
+
+--yes
+     Assume "yes" on most questions.
+
+--no
+     Assume "no" on most questions.
+
+--always-trust
+     Skip key validation and assume that used keys are always fully
+     trusted.  You won't use this unless you have installed some
+     external validation scheme.
+
+--keyserver `name'
+     Use `name' to lookup keys which are not yet in your keyring. This
+     is only done while verifying messages with signatures. The option
+     is also required for the command --send-keys to specify the
+     keyserver to where the keys should be send. All keyservers
+     synchronize with each other - so there is no need to send keys to
+     more than one server. Using the command "host -l pgp.net | grep
+     wwwkeys" gives you a list of keyservers. Because there is load
+     balancing using round-robin DNS you may notice that you get
+     different key servers.
+
+--no-auto-key-retrieve
+     This option disables the automatic retrieving of keys from a
+     keyserver while verifying signatures. This option allows you to
+     keep a keyserver in the options file for the --send-keys and
+     -recv-keys commands.
+
+--honor-http-proxy
+     Try to access the keyserver over the proxy set with the variable
+     "http_proxy".
+
+--keyring `file'
+     Add `file' to the list of keyrings.  If `file' begins with a tilde
+     and a slash, these are replaced by the HOME directory. If the
+     filename does not contain a slash, it is assumed to be in the
+     home-directory ("~/.gnupg" if --homedir is not used).  The
+     filename may be prefixed with a scheme:
+
+     "gnupg-ring:" is the default one.
+
+     "gnupg-gdbm:" may be used for a GDBM ring. Note that GDBM is
+     experimental and likely to be removed in future versions.
+
+     It might make sense to use it together with --no-default-keyring.
+
+--secret-keyring `file'
+     Same as --keyring but for the secret keyrings.
+
+--homedir `directory'
+     Set the name of the home directory to `directory' If this option
+     is not used it defaults to "~/.gnupg". It does not make sense to
+     use this in a options file. This also overrides the environment
+     variable "GNUPGHOME".
+
+--charset `name'
+     Set the name of the native character set. This is used to convert
+     some strings to proper UTF-8 encoding.  Valid values for `name'
+     are:
+
+    iso-8859-1
+          This is the default Latin 1 set.
+
+    iso-8859-2
+          The Latin 2 set.
+
+    koi8-r
+          The usual Russian set (rfc1489).
+
+    utf-8
+          Bypass all translations and assume that the OS uses native
+          UTF-8 encoding.
+
+--utf8-strings
+--no-utf8-strings
+     Assume that the arguments are already given as UTF8 strings. The
+     default (--no-utf8-strings) is to assume that arguments are
+     encoded in the character set as specified by --charset. These
+     options affect all following arguments. Both options may be used
+     multiple times.
+
+--options `file'
+     Read options from `file' and do not try to read them from the
+     default options file in the homedir (see --homedir). This option
+     is ignored if used in an options file.
+
+--no-options
+     Shortcut for "--options /dev/null". This option is detected before
+     an attempt to open an option file.
+
+--load-extension `name'
+     Load an extension module. If `name' does not contain a slash it is
+     searched in "/usr/local/lib/gnupg" See the manual for more
+     information about extensions.
+
+--debug `flags'
+     Set debugging flags. All flags are or-ed and `flags' may be given
+     in C syntax (e.g. 0x0042).
+
+--debug-all
+     Set all useful debugging flags.
+
+--status-fd `n'
+     Write special status strings to the file descriptor `n'.  See the
+     file DETAILS in the documentation for a listing of them.
+
+--logger-fd `n'
+     Write log output to file descriptor `n' and not to stderr.
+
+--no-comment
+     Do not write comment packets. This option affects only the
+     generation of secret keys. Please note, that this has nothing to
+     do with the comments in clear text signatures.
+
+--comment `string'
+     Use `string' as comment string in clear text signatures.  To
+     suppress those comment strings entirely, use an empty string here.
+
+--default-comment
+     Force to write the standard comment string in clear text
+     signatures. Use this to overwrite a --comment from a config file.
+
+--no-version
+     Omit the version string in clear text signatures.
+
+--emit-version
+     Force to write the version string in clear text signatures. Use
+     this to overwrite a previous --no-version from a config file.
+
+-N, --notation-data `name=value'
+     Put the name value pair into the signature as notation data.
+     `name' must consist only of alphanumeric characters, digits or the
+     underscore; the first character must not be a digit.  `value' may
+     be any printable string; it will be encoded in UTF8, so you should
+     check that your --charset is set correctly.  If you prefix `name'
+     with an exclamation mark, the notation data will be flagged as
+     critical (rfc2440:5.2.3.15).
+
+--set-policy-url `string'
+     Use `string' as Policy URL for signatures (rfc2440:5.2.3.19).  If
+     you prefix it with an exclamation mark, the policy URL packet will
+     be flagged as critical.
+
+--set-filename `string'
+     Use `string' as the name of file which is stored in messages.
+
+--use-embedded-filename
+     Try to create a file with a name as embedded in the data.  This
+     can be a dangerous option as it allows to overwrite files.
+
+--completes-needed `n'
+     Number of completely trusted users to introduce a new key signer
+     (defaults to 1).
+
+--marginals-needed `n'
+     Number of marginally trusted users to introduce a new key signer
+     (defaults to 3)
+
+--max-cert-depth `n'
+     Maximum depth of a certification chain (default is 5).
+
+--cipher-algo `name'
+     Use `name' as cipher algorithm. Running the program with the
+     command --version yields a list of supported algorithms. If this
+     is not used the cipher algorithm is selected from the preferences
+     stored with the key.
+
+--digest-algo `name'
+     Use `name' as message digest algorithm. Running the program with
+     the command --version yields a list of supported algorithms.
+     Please note that using this option may violate the OpenPGP
+     requirement, that a 160 bit hash is to be used for DSA.
+
+--s2k-cipher-algo `name'
+     Use `name' as the cipher algorithm used to protect secret keys.
+     The default cipher is BLOWFISH. This cipher is also used for
+     conventional encryption if --cipher-algo is not given.
+
+--s2k-digest-algo `name'
+     Use `name' as the digest algorithm used to mangle the passphrases.
+     The default algorithm is RIPE-MD-160.  This digest algorithm is
+     also used for conventional encryption if --digest-algo is not
+     given.
+
+--s2k-mode `n'
+     Selects how passphrases are mangled. If `n' is 0 a plain
+     passphrase (which is not recommended) will be used, a 1 (default)
+     adds a salt to the passphrase and a 3 iterates the whole process a
+     couple of times.  Unless --rfc1991 is used, this mode is also used
+     for conventional encryption.
+
+--compress-algo `n'
+     Use compress algorithm `n'. Default is 2 which is 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 preferences; note, that this can't
+     be done if you do not encrypt the data.
+
+--disable-cipher-algo `name'
+     Never allow the use of `name' as cipher algorithm.  The given name
+     will not be checked so that a later loaded algorithm will still
+     get disabled.
+
+--disable-pubkey-algo `name'
+     Never allow the use of `name' as public key algorithm.  The given
+     name will not be checked so that a later loaded algorithm will
+     still get disabled.
+
+--no-sig-cache
+     Do not cache the verification status of key signatures.  Caching
+     gives a much better performance in key listings. However, if you
+     suspect that your public keyring is not save against write
+     modifications, you can use this option to disable the caching. It
+     probably does not make sense to disable it because all kind of
+     damage can be done if someone else has write access to your public
+     keyring.
+
+--no-sig-create-check
+     GnuPG normally verifies each signature right after creation to
+     protect against bugs and hardware malfunctions which could leak
+     out bits from the secret key. This extra verification needs some
+     time (about 115% for DSA keys), and so this option can be used to
+     disable it.  However, due to the fact that the signature creation
+     needs manual interaction, this performance penalty does not matter
+     in most settings.
+
+--throw-keyid
+     Do not put the keyid into encrypted packets. This option hides the
+     receiver of the message and is a countermeasure against traffic
+     analysis. It may slow down the decryption process because all
+     available secret keys are tried.
+
+--not-dash-escaped
+     This option changes the behavior of cleartext signatures so that
+     they can be used for patch files. You should not send such an
+     armored file via email because all spaces and line endings are
+     hashed too. You can not use this option for data which has 5
+     dashes at the beginning of a line, patch files don't have this. A
+     special armor header line tells GnuPG about this cleartext
+     signature option.
+
+--escape-from-lines
+     Because some mailers change lines starting with "From " to "<From
+     " it is good to handle such lines in a special way when creating
+     cleartext signatures. All other PGP versions do it this way too.
+     This option is not enabled by default because it would violate
+     rfc2440.
+
+--passphrase-fd `n'
+     Read the passphrase from file descriptor `n'. If you use 0 for
+     `n', the passphrase will be read from stdin. This can only be used
+     if only one passphrase is supplied.  Don't use this option if you
+     can avoid it.
+
+--command-fd `n'
+     This is a replacement for the deprecated shared-memory IPC mode.
+     If this option is enabled, user input on questions is not expected
+     from the TTY but from the given file descriptor. It should be used
+     together with --status-fd. See the file doc/DETAILS in the source
+     distribution for details on how to use it.
+
+--use-agent
+     Try to use the GnuPG-Agent. Please note that this agent is still
+     under development. With this option, GnuPG first tries to connect
+     to the agent before it asks for a passphrase.
+
+--rfc1991
+     Try to be more RFC1991 (PGP 2.x) compliant.
+
+--openpgp
+     Reset all packet, cipher and digest options to OpenPGP behavior.
+     Use this option to reset all previous options like --rfc1991,
+     -force-v3-sigs, -s2k-*, --cipher-algo, -digest-algo and
+     -compress-algo to OpenPGP compliant values. All PGP workarounds
+     are also disabled.
+
+--force-v3-sigs
+     OpenPGP states that an implementation should generate v4
+     signatures but PGP 5.x recognizes v4 signatures only on key
+     material. This option forces v3 signatures for signatures on data.
+
+--force-mdc
+     Force the use of encryption with appended manipulation code. This
+     is always used with the newer ciphers (those with a blocksize
+     greater than 64 bit).  This option might not be implemented yet.
+
+--allow-non-selfsigned-uid
+     Allow the import of keys with user IDs which are not self-signed,
+     but have at least one signature.  This only allows the import -
+     key validation will fail and you have to check the validity of the
+     key my other means. This hack is 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.
+
+--allow-freeform-uid
+     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.
+
+--ignore-time-conflict
+     GnuPG normally checks that the timestamps associated with keys and
+     signatures have plausible values. However, sometimes a signature
+     seems to be older than the key due to clock problems. This option
+     makes these checks just a warning.
+
+--ignore-crc-error
+     The ASCII armor used by OpenPG is protected by a CRC checksum
+     against transmission errors. Sometimes it happens that the CRC
+     gets mangled somewhere on the transmission channel but the actual
+     content (which is anyway protected by the OpenPGP protocol) is
+     still okay. This option will let gpg ignore CRC errors.
+
+--lock-once
+     Lock the databases the first time a lock is requested and do not
+     release the lock until the process terminates.
+
+--lock-multiple
+     Release the locks every time a lock is no longer needed. Use this
+     to override a previous --lock-once from a config file.
+
+--lock-never
+     Disable locking entirely. This option should be used only in very
+     special environments, where it can be assured that only one process
+     is accessing those files. A bootable floppy with a stand-alone
+     encryption system will probably use this. Improper usage of this
+     option may lead to data and key corruption.
+
+--no-random-seed-file
+     GnuPG uses a file to store its internal random pool over
+     invocations.  This makes random generation faster; however
+     sometimes write operations are not desired. This option can be
+     used to achieve that with the cost of slower random generation.
+
+--no-verbose
+     Reset verbose level to 0.
+
+--no-greeting
+     Suppress the initial copyright message but do not enter batch mode.
+
+--no-secmem-warning
+     Suppress the warning about "using insecure memory".
+
+--no-armor
+     Assume the input data is not in ASCII armored format.
+
+--no-default-keyring
+     Do not add the default keyrings to the list of keyrings.
+
+--skip-verify
+     Skip the signature verification step. This may be used to make the
+     decryption faster if the signature verification is not needed.
+
+--with-colons
+     Print key listings delimited by colons.
+
+--with-key-data
+     Print key listings delimited by colons and print the public key
+     data.
+
+--with-fingerprint
+     Same as the command --fingerprint but changes only the format of
+     the output and may be used together with another command.
+
+--fast-list-mode
+     Changes the output of the list commands to work faster; this is
+     achieved by leaving some parts empty. Some applications don't need
+     the user ID and the trust information given in the listings. By
+     using this options they can get a faster listing. The exact
+     behaviour of this option may change in future versions.
+
+--fixed-list-mode
+     Do not merge user ID and primary key in --with-colon listing mode
+     and print all timestamps as seconds since 1970-01-01.
+
+--list-only
+     Changes the behaviour of some commands. This is like --dry-run but
+     different in some cases. The semantic of this command may be
+     extended in the future. Currently it only skips the actual
+     decryption pass and therefore enables a fast listing of the
+     encryption keys.
+
+--no-literal
+     This is not for normal use. Use the source to see for what it
+     might be useful.
+
+--set-filesize
+     This is not for normal use. Use the source to see for what it
+     might be useful.
+
+--emulate-md-encode-bug
+     GnuPG versions prior to 1.0.2 had a bug in the way a signature was
+     encoded.  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.
+
+--show-session-key
+     Display the session key used for one message. See
+     --override-session-key for the counterpart of this option.
+
+     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.
+
+--override-session-key `string'
+     Don't use the public key but the session key `string'. 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.
+
+--merge-only
+     Don't insert new keys into the keyrings while doing an import.
+
+--allow-secret-key-import
+     Allow import of secret keys. The import command normally skips
+     secret keys because a secret key can otherwise be used to attack
+     the trust calculation.
+
+--try-all-secrets
+     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.
+
+--enable-special-filenames
+     This options enables a mode in which filenames of the form `-&n',
+     where n is a non-negative decimal number, refer to the file
+     descriptor n and not to a file with that name.
+
+--no-expensive-trust-checks
+     Experimental use only.
+
+How to specify a user ID
+************************
+
+   There are different ways on how to specify a user ID to GnuPG; here
+are some examples:
+
+
+
+234567C4
+0F34E556E
+01347A56A
+0xAB123456
+     Here the key ID is given in the usual short form.
+
+234AABBCC34567C4
+0F323456784E56EAB
+01AB3FED1347A5612
+0x234AABBCC34567C4
+     Here the key ID is given in the long form as used by OpenPGP.
+
+1234343434343434C434343434343434
+123434343434343C3434343434343734349A3434
+0E12343434343434343434EAB3484343434343434
+0xE12343434343434343434EAB3484343434343434
+     The best way to specify a key ID is by using the fingerprint of
+     the key. This avoids any ambiguities in case that there are
+     duplicated key IDs (which are really rare for the long key IDs).
+
+=Heinrich Heine <heinrichh@uni-duesseldorf.de>
+     Using an exact to match string. The equal sign indicates this.
+
+<heinrichh@uni-duesseldorf.de>
+     Using the email address part which must match exactly. The left
+     angle bracket indicates this email address mode.
+
++Heinrich Heine duesseldorf
+     All words must match exactly (not case sensitive) but can appear in
+     any order in the user ID. Words are any sequences of letters,
+     digits, the underscore and all characters with bit 7 set.
+
+#34
+     Using the Local ID. This is a very low level method and should
+     only be used by applications which really need it. The hash
+     character indicates this method. An application should not assume
+     that this is only a number.
+
+Heine
+*Heine
+     By case insensitive substring matching. This is the default mode
+     but applications may want to explicitly indicate this by putting
+     the asterisk in front.
+
+   Note that you can append an exclamation mark to key IDs or
+fingerprints. This flag which tells GnuPG to use exactly that primary
+or secondary key and don't try to figure out which secondary or primary
+key to use.
+
+RETURN VALUE
+************
+
+   The program returns 0 if everything was fine, 1 if at least a
+signature was bad, and other error codes for fatal errors.
+
+EXAMPLES
+********
+
+gpg -se -r `Bob' `file'
+     sign and encrypt for user Bob
+
+gpg --clearsign `file'
+     make a clear text signature
+
+gpg -sb `file'
+     make a detached signature
+
+gpg --list-keys `user_ID'
+     show keys
+
+gpg --fingerprint `user_ID'
+     show fingerprint
+
+gpg --verify `pgpfile'
+gpg --verify `sigfile' `files'
+     Verify the signature of the file but do not output the data. The
+     second form is used for detached signatures, where `sigfile' is
+     the detached signature (either ASCII armored of binary) and
+     `files' are the signed data; if this is not given the name of the
+     file holding the signed data is constructed by cutting off the
+     extension (".asc" or ".sig") of `sigfile' or by asking the user
+     for the filename.
+
+ENVIRONMENT
+***********
+
+HOME
+     Used to locate the default home directory.
+
+GNUPGHOME
+     If set directory used instead of "~/.gnupg".
+
+http_proxy
+     Only honored when the option --honor-http-proxy is set.
+
+FILES
+*****
+
+~/.gnupg/secring.gpg
+     The secret keyring
+
+~/.gnupg/secring.gpg.lock
+     and the lock file
+
+~/.gnupg/pubring.gpg
+     The public keyring
+
+~/.gnupg/pubring.gpg.lock
+     and the lock file
+
+~/.gnupg/trustdb.gpg
+     The trust database
+
+~/.gnupg/trustdb.gpg.lock
+     and the lock file
+
+~/.gnupg/random_seed
+     used to preserve the internal random pool
+
+~/.gnupg/options
+     May contain options
+
+/usr[/local]/share/gnupg/options.skel
+     Skeleton options file
+
+/usr[/local]/lib/gnupg/
+     Default location for extensions
+
+WARNINGS
+********
+
+   Use a *good* password for your user account and a *good* passphrase
+to protect your secret key. This passphrase is the weakest part of the
+whole system. Programs to do dictionary attacks on your secret keyring
+are very easy to write and so you should protect your "~/.gnupg/"
+directory very well.
+
+   Keep in mind that, if this program is used over a network (telnet),
+it is *very* easy to spy out your passphrase!
+
+   If you are going to verify detached signatures, make sure that the
+program nows about it; either be giving both filenames on the
+commandline or using `-' to specify stdin.
+
+BUGS
+****
+
+   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. 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.
+
+
+
+Tag Table:
+Node: Top67
+
+End Tag Table
diff -urN gnupg-1.0.4/doc/gpg.sgml gnupg-1.0.5/doc/gpg.sgml
--- gnupg-1.0.4/doc/gpg.sgml	Wed Sep  6 13:57:34 2000
+++ gnupg-1.0.5/doc/gpg.sgml	Sat Apr 28 20:43:18 2001
@@ -1,5 +1,5 @@
 <!-- gpg.sgml - the man page for GnuPG
-    Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+    Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
     This file is part of GnuPG.
 
@@ -72,7 +72,7 @@
 <command/gpg/ is the main program for the GnuPG system.
     </para>
     <para>
-This man page does only list the commands and options available.
+This man page only lists the commands and options available.
 For a more verbose documentation get the GNU Privacy Handbook (GPH), which is
 available at http://www.gnupg.org/gph/ .
 You will find a list of HOWTO documents at http://www.gnupg.org/docs.html .
@@ -119,7 +119,7 @@
 <varlistentry>
 <term>-c, --symmetric</term>
 <listitem><para>
-Encrypt with symmetric cipher only
+Encrypt with symmetric cipher only.
 This command asks for a passphrase.
 </para></listitem></varlistentry>
 
@@ -150,24 +150,25 @@
 <listitem><para>
 Assume that <parameter/sigfile/ is a signature and verify it
 without generating any output.	With no arguments,
-the signature packet is read from stdin (it may be a
-detached signature when not used in batch mode). If
+the signature packet is read from stdin.  If
 only a sigfile is given, it may be a complete
 signature or a detached signature, in which case
 the signed stuff is expected in a file without the
-".sig" or ".asc" extension (if such a file does
-not exist it is expected at stdin; use a single dash ("-") as
-filename to force a read from stdin). With more than
+".sig" or ".asc" extension. 
+With more than
 1 argument, the first should be a detached signature
-and the remaining files are the signed stuff.
+and the remaining files are the signed stuff.  To read the signed
+stuff from stdin, use <literal>-</literal> as the second filename.
+For security reasons a detached signature cannot read the signed
+material from stdin without denoting it in the above way.
 </para></listitem></varlistentry>
 
 <varlistentry>
 <term>--verify-files <optional><parameter/files/</optional></term>
 <listitem><para>
 This is a special version of the --verify command which does not work with
-detached signatures.  The command expects the files to bee verified either
-on the commandline or reads the filenames from stdin;  each anem muts be on
+detached signatures.  The command expects the files to be verified either
+on the command line or reads the filenames from stdin;  each name must be on
 separate line. The command is intended for quick checking of many files.
 </para></listitem></varlistentry>
 
@@ -242,10 +243,10 @@
 <term>--gen-key</term>
 <listitem><para>
 Generate a new key pair. This command is normally only used
-interactive.
+interactively.
 </para>
 <para>
-There is an experimental feature which allows to create keys
+There is an experimental feature which allows you to create keys
 in batch mode. See the file <filename>doc/DETAILS</filename>
 in the source distribution on how to use this.
 </para></listitem></varlistentry>
@@ -301,7 +302,7 @@
     <varlistentry>
     <term>deluid</term>
     <listitem><para>
-Delete an user id.</para></listitem></varlistentry>
+Delete a user id.</para></listitem></varlistentry>
     <varlistentry>
     <term>addkey</term>
     <listitem><para>
@@ -344,6 +345,10 @@
     <listitem><para>
 List preferences.</para></listitem></varlistentry>
     <varlistentry>
+    <term>showpref</term>
+    <listitem><para>
+More verbose preferences listing.</para></listitem></varlistentry>
+    <varlistentry>
     <term>toggle</term>
     <listitem><para>
 Toggle between public and secret key listing.</para></listitem></varlistentry>
@@ -366,7 +371,8 @@
 trust value.  Letters are used for the values:</para>
     <variablelist>
       <varlistentry><term>-</term><listitem><para>No ownertrust assigned / not yet calculated.</para></listitem></varlistentry>
-      <varlistentry><term>e</term><listitem><para>Trust calculation has failed.</para></listitem></varlistentry>
+      <varlistentry><term>e</term><listitem><para>Trust
+calculation has failed; probably due to an expired key.</para></listitem></varlistentry>
       <varlistentry><term>q</term><listitem><para>Not enough information for calculation.</para></listitem></varlistentry>
       <varlistentry><term>n</term><listitem><para>Never trust this key.</para></listitem></varlistentry>
       <varlistentry><term>m</term><listitem><para>Marginally trusted.</para></listitem></varlistentry>
@@ -378,14 +384,14 @@
 <varlistentry>
 <term>--sign-key &ParmName;</term>
 <listitem><para>
-Sign a public key with you secret key.	This is a shortcut version
+Sign a public key with your secret key.	This is a shortcut version
 of the subcommand "sign" from --edit.
 </para></listitem></varlistentry>
 
 <varlistentry>
 <term>--lsign-key &ParmName;</term>
 <listitem><para>
-Sign a public key with you secret key but mark it as non-exportable.
+Sign a public key with your secret key but mark it as non-exportable.
 This is a shortcut version of the subcommand "lsign" from --edit.
 </para></listitem></varlistentry>
 
@@ -396,7 +402,7 @@
 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
+online but still want to be able to check the validity of a given
 recipient's or signator's key. 
 </para></listitem></varlistentry>
 
@@ -413,6 +419,12 @@
 </para></listitem></varlistentry>
 
 <varlistentry>
+<term>--delete-secret-and-public-key  &ParmName;</term>
+<listitem><para>
+Same as --delete-key, but if a secret key exists, it will be removed first.
+</para></listitem></varlistentry>
+
+<varlistentry>
 <term>--gen-revoke</term>
 <listitem><para>
 Generate a revocation certificate for the complete key. To revoke
@@ -446,8 +458,8 @@
 <varlistentry>
 <term>--export-all &OptParmNames;</term>
 <listitem><para>
-Same as --export, but does also export keys which
-are not compatible to OpenPGP.
+Same as --export, but also exports keys which
+are not compatible with OpenPGP.
 </para></listitem></varlistentry>
 
 
@@ -455,12 +467,12 @@
 <term>--export-secret-keys &OptParmNames;</term>
 <term>--export-secret-subkeys &OptParmNames;</term>
 <listitem><para>
-Same as --export, but does export the secret keys.
+Same as --export, but exports the secret keys instead.
 This is normally not very useful and a security risk.
-the second form of the command has the special property to
+The second form of the command has the special property to
 render the secret part of the primary key useless; this is
 a GNU extension to OpenPGP and other implementations can
-not be expected to successful import such a key.
+not be expected to successfully import such a key.
 </para></listitem></varlistentry>
 
 
@@ -476,8 +488,9 @@
 </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
+Most notable here is the --merge-only option which does not insert new keys
 but does only the merging of new signatures, user-IDs and subkeys.
+See also the option --allow-secret-key-import.
 </para></listitem></varlistentry>
 
 
@@ -494,7 +507,7 @@
 <term>--export-ownertrust</term>
 <listitem><para>
 List the assigned ownertrust values in ASCII format
-for backup purposes
+for backup purposes.
 </para></listitem></varlistentry>
 
 
@@ -522,7 +535,7 @@
 <listitem><para>
 Emit COUNT random bytes of the given quality level. If count is not given
 or zero, an endless sequence of random bytes will be emitted.
-PLEASE, don't use this command unless you know what you are doing, it may
+PLEASE, don't use this command unless you know what you are doing; it may
 remove precious entropy from the system!
 </para></listitem></varlistentry>
 
@@ -553,8 +566,8 @@
 <varlistentry>
 <term>-h, --help</term>
 <listitem><para>
-Print usage information.  This is a really long list even it does list
-not all options.
+Print usage information.  This is a really long list even though it doesn't list
+all options.
 </para></listitem></varlistentry>
 
 
@@ -622,7 +635,7 @@
 <term>--default-recipient &ParmName;</term>
 <listitem><para>
 Use &ParmName; as default recipient if option --recipient is not used and
-don't ask if this is a valid one. &ParmName; must be a non empty.
+don't ask if this is a valid one. &ParmName; must be non-empty.
 </para></listitem></varlistentry>
 
 <varlistentry>
@@ -643,9 +656,9 @@
 <varlistentry>
 <term>--encrypt-to &ParmName;</term>
 <listitem><para>
-Same as --recipient but this one is intended for
-in the options file and may be used together with
-an own user-id as an "encrypt-to-self".  These keys
+Same as --recipient but this one is intended for use
+in the options file and may be used with
+your own user-id as an "encrypt-to-self".  These keys
 are only used when there are other recipients given
 either by use of --recipient or by the asked user id.
 No trust checking is performed for these user ids and
@@ -722,7 +735,7 @@
 <listitem><para>
 Make sure that the TTY (terminal) is never used for any output.
 This option is needed in some cases because GnuPG sometimes prints
-warnings to the TTY if if --batch is used.
+warnings to the TTY if --batch is used.
 </para></listitem></varlistentry>
 
 
@@ -777,8 +790,8 @@
 <term>--no-auto-key-retrieve</term>
 <listitem><para>
 This option disables the automatic retrieving of keys from a keyserver
-while verifying signatures. This option allows to keep a keyserver in
-the options file or the --send-keys and --recv-keys commands.
+while verifying signatures. This option allows you to keep a keyserver in
+the options file for the --send-keys and --recv-keys commands.
 </para></listitem></varlistentry>
 
 
@@ -838,6 +851,10 @@
 <varlistentry>
 <term>koi8-r</term><listitem><para>The usual Russian set (rfc1489).</para></listitem>
 </varlistentry>
+<varlistentry>
+<term>utf-8</term><listitem><para>Bypass all translations and assume
+that the OS uses native UTF-8 encoding.</para></listitem>
+</varlistentry>
 </variablelist>
 </listitem></varlistentry>
 
@@ -849,8 +866,8 @@
 Assume that the arguments are already given as UTF8 strings.  The default
 (--no-utf8-strings)
 is to assume that arguments are encoded in the character set as specified
-by --charset. These options effects all following arguments.  Both options may
-used multiple times.
+by --charset. These options affect all following arguments.  Both options may
+be used multiple times.
 </para></listitem></varlistentry>
 
 
@@ -957,10 +974,10 @@
 <term>-N, --notation-data &ParmNameValue;</term>
 <listitem><para>
 Put the name value pair into the signature as notation data.
-&ParmName; must consists only of alphanumeric characters, digits
+&ParmName; must consist only of alphanumeric characters, digits
 or the underscore; the first character must not be a digit.
-&ParmValue; may be any printable string; it will encoded in UTF8,
-so sou should have check that your --charset is set right.
+&ParmValue; may be any printable string; it will be encoded in UTF8,
+so you should check that your --charset is set correctly.
 If you prefix &ParmName; with an exclamation mark, the notation
 data will be flagged as critical (rfc2440:5.2.3.15).
 </para></listitem></varlistentry>
@@ -1098,6 +1115,28 @@
 </para></listitem></varlistentry>
 
 <varlistentry>
+<term>--no-sig-cache</term>
+<listitem><para>
+Do not cache the verification status of key signatures.
+Caching gives a much better performance in key listings.  However, if
+you suspect that your public keyring is not save against write
+modifications, you can use this option to disable the caching.  It
+probably does not make sense to disable it because all kind of damage
+can be done if someone else has write access to your public keyring.
+</para></listitem></varlistentry>
+<varlistentry>
+
+<term>--no-sig-create-check</term>
+<listitem><para>
+GnuPG normally verifies each signature right after creation to protect
+against bugs and hardware malfunctions which could leak out bits from
+the secret key.  This extra verification needs some time (about 115%
+for DSA keys), and so this option can be used to disable it.
+However, due to the fact that the signature creation needs manual
+interaction, this performance penalty does not matter in most settings.
+</para></listitem></varlistentry>
+
+<varlistentry>
 <term>--throw-keyid</term>
 <listitem><para>
 Do not put the keyid into encrypted packets.  This option
@@ -1144,13 +1183,21 @@
 <varlistentry>
 <term>--command-fd &ParmN;</term>
 <listitem><para>
-This is a replacement for the depreciated shared-memory IPC mode.
+This is a replacement for the deprecated shared-memory IPC mode.
 If this option is enabled, user input on questions is not expected
 from the TTY but from the given file descriptor.  It should be used
 together with --status-fd. See the file doc/DETAILS in the source
 distribution for details on how to use it.
 </para></listitem></varlistentry>
 
+<varlistentry>
+<term>--use-agent</term>
+<listitem><para>
+Try to use the GnuPG-Agent. Please note that this agent is still under
+development.  With this option, GnuPG first tries to connect to the
+agent before it asks for a passphrase.
+</para></listitem></varlistentry>
+
 
 <varlistentry>
 <term>--rfc1991</term>
@@ -1176,7 +1223,7 @@
 <listitem><para>
 OpenPGP states that an implementation should generate
 v4 signatures but PGP 5.x recognizes v4 signatures only
-on key material.  This options forces v3 signatures for
+on key material.  This option forces v3 signatures for
 signatures on data.
 </para></listitem></varlistentry>
 
@@ -1185,7 +1232,7 @@
 <term>--force-mdc</term>
 <listitem><para>
 Force the use of encryption with appended manipulation
-code.  This is always used with the newer cipher (those
+code.  This is always used with the newer ciphers (those
 with a blocksize greater than 64 bit).
 This option might not be implemented yet.
 </para></listitem></varlistentry>
@@ -1193,8 +1240,9 @@
 <varlistentry>
 <term>--allow-non-selfsigned-uid</term>
 <listitem><para>
-Allow the import of keys with user IDs which are not self-signed.
-This is only allows the import - key validation will fail and you
+Allow the import of keys with user IDs which are not self-signed, but
+have at least one signature.
+This only allows the import - key validation will fail and you
 have to check the validity of the key my other means.  This hack is
 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
@@ -1219,6 +1267,17 @@
 checks just a warning.
 </para></listitem></varlistentry>
 
+<varlistentry>
+<term>--ignore-crc-error</term>
+<listitem><para>
+The ASCII armor used by OpenPG is protected by a CRC checksum against
+transmission errors.  Sometimes it happens that the CRC gets mangled
+somewhere on the transmission channel 
+but the actual content (which is anyway protected by
+the OpenPGP protocol) is still okay.  This option will let gpg ignore
+CRC errors.
+</para></listitem></varlistentry>
+
 
 <varlistentry>
 <term>--lock-once</term>
@@ -1242,7 +1301,7 @@
 <listitem><para>
 Disable locking entirely.  This option should be used only in very
 special environments, where it can be assured that only one process
-is accessing those files.  A bootable floppy with a standalone
+is accessing those files.  A bootable floppy with a stand-alone
 encryption system will probably use this.  Improper usage of this
 option may lead to data and key corruption.
 </para></listitem></varlistentry>
@@ -1250,9 +1309,9 @@
 <varlistentry>
 <term>--no-random-seed-file</term>
 <listitem><para>
-GnuPG uses a file to store it's internal random pool over invocations.
+GnuPG uses a file to store its internal random pool over invocations.
 This makes random generation faster; however sometimes write operations
-are not desired.  This option can be used to achive that with the cost of
+are not desired.  This option can be used to achieve that with the cost of
 slower random generation.
 </para></listitem></varlistentry>
 
@@ -1328,16 +1387,23 @@
 Changes the output of the list commands to work faster; this is achieved
 by leaving some parts empty.  Some applications don't need the user ID and
 the trust information given in the listings.  By using this options they
-can get a faster listing.  The excact behaviour of this option may change
+can get a faster listing.  The exact behaviour of this option may change
 in future versions.
 </para></listitem></varlistentry>
 
 <varlistentry>
+<term>--fixed-list-mode</term>
+<listitem><para>
+Do not merge user ID and primary key in --with-colon listing mode and
+print all timestamps as seconds since 1970-01-01.
+</para></listitem></varlistentry>
+
+<varlistentry>
 <term>--list-only</term>
 <listitem><para>
 Changes the behaviour of some commands.  This is like --dry-run but
 different in some cases.  The semantic of this command may be extended in
-the future.  Currently it does only skip the actual decryption pass and
+the future.  Currently it only skips the actual decryption pass and
 therefore enables a fast listing of the encryption keys.
 </para></listitem></varlistentry>
 
@@ -1356,7 +1422,7 @@
 <varlistentry>
 <term>--emulate-md-encode-bug</term>
 <listitem><para>
-GnuPG versions prior to 1.0.2 had a bug in the way a signature was encode.
+GnuPG versions prior to 1.0.2 had a bug in the way a signature was encoded.
 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.
@@ -1392,6 +1458,14 @@
 </para></listitem></varlistentry>
 
 <varlistentry>
+<term>--allow-secret-key-import</term>
+<listitem><para>
+Allow import of secret keys.  The import command normally skips secret
+keys because a secret key can otherwise be used to attack the trust
+calculation.
+</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
@@ -1400,6 +1474,19 @@
 handy in case where an encrypted message contains a bogus key ID.
 </para></listitem></varlistentry>
 
+<varlistentry>
+<term>--enable-special-filenames</term>
+<listitem><para>
+This options enables a mode in which filenames of the form
+<filename>-&#38;n</>, where n is a non-negative decimal number,
+refer to the file descriptor n and not to a file with that name.
+</para></listitem></varlistentry>
+
+<varlistentry>
+<term>--no-expensive-trust-checks</term>
+<listitem><para>
+Experimental use only.
+</para></listitem></varlistentry>
 
 </variablelist>
 </refsect1>
@@ -1415,7 +1502,7 @@
     <variablelist>
 <varlistentry>
 <term></term>
-<listitem><para>Used to locate the default home directory.</para></listitem>
+<listitem><para></para></listitem>
 </varlistentry>
 
 <varlistentry>
@@ -1451,14 +1538,14 @@
 </varlistentry>
 
 <varlistentry>
-<term>=Heinrich Heine &lt;heinrichh@uni-duesseldorf.de&gt;</term>
+<term>=Heinrich Heine &#60;heinrichh@uni-duesseldorf.de&#62;</term>
 <listitem><para>
 Using an exact to match string.  The equal sign indicates this.
 </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term>&lt;heinrichh@uni-duesseldorf.de&gt;</term>
+<term>&#60;heinrichh@uni-duesseldorf.de&#62;</term>
 <listitem><para>
 Using the email address part which must match exactly.	The left angle bracket
 indicates this email address mode.
@@ -1489,13 +1576,20 @@
 <term>*Heine</term>
 <listitem><para>
 By case insensitive substring matching.  This is the default mode but
-applications may want to explicitely indicate this by putting the asterisk
+applications may want to explicitly indicate this by putting the asterisk
 in front.
 </para></listitem>
 </varlistentry>
 
     </variablelist>
 
+    <para>
+Note that you can append an exclamation mark to key IDs or
+fingerprints.  This flag which tells GnuPG to use exactly
+that primary or secondary key and don't try to figure out which 
+secondary or primary key to use.
+    </para>
+
 </refsect1>
 
 
@@ -1644,6 +1738,11 @@
 Keep in mind that, if this program is used over a network (telnet), it
 is *very* easy to spy out your passphrase!
 </para>
+<para>
+If you are going to verify detached signatures, make sure that the
+program nows about it; either be giving both filenames on the
+commandline or using <literal>-</literal> to specify stdin.
+</para>
 </refsect1>
 
 
@@ -1653,7 +1752,7 @@
 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. If you get no
-warning message about insecure memory 3our operating system supports
+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.
 </para>
diff -urN gnupg-1.0.4/doc/gpg.texi gnupg-1.0.5/doc/gpg.texi
--- gnupg-1.0.4/doc/gpg.texi	Thu Jan  1 01:00:00 1970
+++ gnupg-1.0.5/doc/gpg.texi	Sat Apr 28 20:43:43 2001
@@ -0,0 +1,1057 @@
+\input texinfo
+@c This Texinfo document has been automatically generated by
+@c docbook2texi from a DocBook documentation.  The tool used
+@c can be found at:
+@c <URL:http://shell.ipoline.com/~elmert/hacks/docbook2X/>
+@c Please send any bug reports, improvements, comments, 
+@c patches, etc. to Steve Cheng <steve@ggi-project.org>.
+
+@setfilename gpg.info
+
+@node top
+@top gpg
+@menu
+@end menu
+
+@majorheading Name
+gpg ---- encryption and signing tool
+
+@majorheading Synopsis
+
+@majorheading DESCRIPTION
+@code{gpg} is the main program for the GnuPG system.
+
+This man page only lists the commands and options available.
+For a more verbose documentation get the GNU Privacy Handbook (GPH), which is
+available at http://www.gnupg.org/gph/ .
+You will find a list of HOWTO documents at http://www.gnupg.org/docs.html .
+
+@majorheading COMMANDS
+@code{gpg} recognizes these commands:
+
+@table @asis
+@item -s, ---sign
+Make a signature. This command may be combined
+with ---encrypt.
+
+@item ---clearsign
+Make a clear text signature.
+
+@item -b, ---detach-sign
+Make a detached signature.
+
+@item -e, ---encrypt
+Encrypt data. This option may be combined with ---sign.
+
+@item -c, ---symmetric
+Encrypt with symmetric cipher only.
+This command asks for a passphrase.
+
+@item ---store
+Store only (make a simple RFC1991 packet).
+
+@item ---decrypt @code{file}
+Decrypt @code{file} (or stdin if no file is specified) and
+write it to stdout (or the file specified with
+---output). If the decrypted file is signed, the
+signature is also verified. This command differs
+from the default operation, as it never writes to the
+filename which is included in the file and it
+rejects files which don't begin with an encrypted
+message.
+
+@item ---verify @code{sigfile} @code{signed-files}
+Assume that @code{sigfile} is a signature and verify it
+without generating any output. With no arguments,
+the signature packet is read from stdin. If
+only a sigfile is given, it may be a complete
+signature or a detached signature, in which case
+the signed stuff is expected in a file without the
+".sig" or ".asc" extension. 
+With more than
+1 argument, the first should be a detached signature
+and the remaining files are the signed stuff. To read the signed
+stuff from stdin, use @samp{-} as the second filename.
+For security reasons a detached signature cannot read the signed
+material from stdin without denoting it in the above way.
+
+@item ---verify-files @code{files}
+This is a special version of the ---verify command which does not work with
+detached signatures. The command expects the files to be verified either
+on the command line or reads the filenames from stdin; each name must be on
+separate line. The command is intended for quick checking of many files.
+
+@item ---list-keys @code{names}
+@itemx ---list-public-keys @code{names}
+List all keys from the public keyrings, or just the
+ones given on the command line.
+
+@item ---list-secret-keys @code{names}
+List all keys from the secret keyrings, or just the
+ones given on the command line.
+
+@item ---list-sigs @code{names}
+Same as ---list-keys, but the signatures are listed too.
+
+@item ---check-sigs @code{names}
+Same as ---list-sigs, but the signatures are verified.
+
+@item ---fingerprint @code{names}
+List all keys with their fingerprints. This is the
+same output as ---list-keys but with the additional output
+of a line with the fingerprint. May also be combined
+with ---list-sigs or --check-sigs.
+If this command is given twice, the fingerprints of all
+secondary keys are listed too.
+
+@item ---list-packets
+List only the sequence of packets. This is mainly
+useful for debugging.
+
+@item ---gen-key
+Generate a new key pair. This command is normally only used
+interactively.
+
+There is an experimental feature which allows you to create keys
+in batch mode. See the file @file{doc/DETAILS}
+in the source distribution on how to use this.
+
+@item ---edit-key @code{name}
+Present a menu which enables you to do all key
+related tasks:
+
+@table @asis
+@item sign
+Make a signature on key of user @code{name}
+If the key is not yet signed by the default
+user (or the users given with -u), the
+program displays the information of the key
+again, together with its fingerprint and
+asks whether it should be signed. This
+question is repeated for all users specified
+with -u.
+
+@item lsign
+Same as ---sign but the signature is marked as
+non-exportable and will therefore never be used
+by others. This may be used to make keys valid
+only in the local environment.
+
+@item revsig
+Revoke a signature. GnuPG asks for every
+signature which has been done by one of
+the secret keys, whether a revocation
+certificate should be generated.
+
+@item trust
+Change the owner trust value. This updates the
+trust-db immediately and no save is required.
+
+@item disable
+@itemx enable
+Disable or enable an entire key. A disabled key can normally not be used
+for encryption.
+
+@item adduid
+Create an alternate user id.
+
+@item deluid
+Delete a user id.
+
+@item addkey
+Add a subkey to this key.
+
+@item delkey
+Remove a subkey.
+
+@item revkey
+Revoke a subkey.
+
+@item expire
+Change the key expiration time. If a key is
+selected, the time of this key will be changed.
+With no selection the key expiration of the
+primary key is changed.
+
+@item passwd
+Change the passphrase of the secret key.
+
+@item uid @code{n}
+Toggle selection of user id with index @code{n}.
+Use 0 to deselect all.
+
+@item key @code{n}
+Toggle selection of subkey with index @code{n}.
+Use 0 to deselect all.
+
+@item check
+Check all selected user ids.
+
+@item pref
+List preferences.
+
+@item showpref
+More verbose preferences listing.
+
+@item toggle
+Toggle between public and secret key listing.
+
+@item save
+Save all changes to the key rings and quit.
+
+@item quit
+Quit the program without updating the
+key rings.
+
+@end table
+
+The listing shows you the key with its secondary
+keys and all user ids. Selected keys or user ids
+are indicated by an asterisk. The trust value is
+displayed with the primary key: the first is the
+assigned owner trust and the second is the calculated
+trust value. Letters are used for the values:
+
+@table @asis
+@item -
+No ownertrust assigned / not yet calculated.
+
+@item e
+Trust
+calculation has failed; probably due to an expired key.
+
+@item q
+Not enough information for calculation.
+
+@item n
+Never trust this key.
+
+@item m
+Marginally trusted.
+
+@item f
+Fully trusted.
+
+@item u
+Ultimately trusted.
+
+@end table
+
+@item ---sign-key @code{name}
+Sign a public key with your secret key. This is a shortcut version
+of the subcommand "sign" from ---edit.
+
+@item ---lsign-key @code{name}
+Sign a public key with your secret key but mark it as non-exportable.
+This is a shortcut version of the subcommand "lsign" from ---edit.
+
+@item ---trusted-key @code{long key ID}
+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 want to be able to check the validity of a given
+recipient's or signator's key. 
+
+@item ---delete-key @code{name}
+Remove key from the public keyring
+
+@item ---delete-secret-key @code{name}
+Remove key from the secret and public keyring
+
+@item ---delete-secret-and-public-key @code{name}
+Same as ---delete-key, but if a secret key exists, it will be removed first.
+
+@item ---gen-revoke
+Generate a revocation certificate for the complete key. To revoke
+a subkey or a signature, use the ---edit command.
+
+@item ---export @code{names}
+Either export all keys from all keyrings (default
+keyrings and those registered via option ---keyring),
+or if at least one name is given, those of the given
+name. The new keyring is written to stdout or to
+the file given with option "output". Use together
+with ---armor to mail those keys.
+
+@item ---send-keys @code{names}
+Same as ---export but sends the keys to a keyserver.
+Option ---keyserver must be used to give the name
+of this keyserver. Don't send your complete keyring
+to a keyserver - select only those keys which are new
+or changed by you.
+
+@item ---export-all @code{names}
+Same as ---export, but also exports keys which
+are not compatible with OpenPGP.
+
+@item ---export-secret-keys @code{names}
+@itemx ---export-secret-subkeys @code{names}
+Same as ---export, but exports the secret keys instead.
+This is normally not very useful and a security risk.
+The second form of the command has the special property to
+render the secret part of the primary key useless; this is
+a GNU extension to OpenPGP and other implementations can
+not be expected to successfully import such a key.
+
+@item ---import @code{files}
+@itemx ---fast-import @code{files}
+Import/merge keys. This adds the given keys to the
+keyring.
+The fast version does not build
+the trustdb; this can be done at any time with the
+command ---update-trustdb.
+
+There are a few other options which control how this command works.
+Most notable here is the ---merge-only option which does not insert new keys
+but does only the merging of new signatures, user-IDs and subkeys.
+See also the option ---allow-secret-key-import.
+
+@item ---recv-keys @code{key IDs}
+Import the keys with the given key IDs from a HKP
+keyserver. Option ---keyserver must be used to
+give the name of this keyserver.
+
+@item ---export-ownertrust
+List the assigned ownertrust values in ASCII format
+for backup purposes.
+
+@item ---import-ownertrust @code{files}
+Update the trustdb with the ownertrust values stored
+in @code{files} (or stdin if not given); existing
+values will be overwritten.
+
+@item ---print-md @code{algo} @code{files}
+Print message digest of algorithm ALGO for all given files of stdin.
+If "*" is used for the algorithm, digests for all available algorithms
+are printed.
+
+@item ---gen-random @code{0|1|2} @code{count}
+Emit COUNT random bytes of the given quality level. If count is not given
+or zero, an endless sequence of random bytes will be emitted.
+PLEASE, don't use this command unless you know what you are doing; it may
+remove precious entropy from the system!
+
+@item ---gen-prime @code{mode} @code{bits} @code{qbits}
+Use the source, Luke :-). The output format is still subject to change.
+
+@item ---version
+Print version information along with a list
+of supported algorithms.
+
+@item ---warranty
+Print warranty information.
+
+@item -h, ---help
+Print usage information. This is a really long list even though it doesn't list
+all options.
+
+@end table
+
+@majorheading OPTIONS
+Long options can be put in an options file (default "~/.gnupg/options").
+Do not write the 2 dashes, but simply the name of the option and any
+required arguments. Lines with a hash as the first non-white-space
+character are ignored. Commands may be put in this file too, but that
+does not make sense.
+
+@code{gpg} recognizes these options:
+
+@table @asis
+@item -a, ---armor
+Create ASCII armored output.
+
+@item -o, ---output @code{file}
+Write output to @code{file}.
+
+@item -u, ---local-user @code{name}
+Use @code{name} as the user ID to sign.
+This option is silently ignored for the list commands,
+so that it can be used in an options file.
+
+@item ---default-key @code{name}
+Use @code{name} as default user ID for signatures. If this
+is not used the default user ID is the first user ID
+found in the secret keyring.
+
+@item -r, ---recipient @code{name}
+@itemx 
+Encrypt for user id @code{name}. If this option is not
+specified, GnuPG asks for the user-id unless ---default-recipient is given
+
+@item ---default-recipient @code{name}
+Use @code{name} as default recipient if option ---recipient is not used and
+don't ask if this is a valid one. @code{name} must be non-empty.
+
+@item ---default-recipient-self
+Use the default key as default recipient if option ---recipient is not used and
+don't ask if this is a valid one. The default key is the first one from the
+secret keyring or the one set with ---default-key.
+
+@item ---no-default-recipient
+Reset ---default-recipient and --default-recipient-self.
+
+@item ---encrypt-to @code{name}
+Same as ---recipient but this one is intended for use
+in the options file and may be used with
+your own user-id as an "encrypt-to-self". These keys
+are only used when there are other recipients given
+either by use of ---recipient or by the asked user id.
+No trust checking is performed for these user ids and
+even disabled keys can be used.
+
+@item ---no-encrypt-to
+Disable the use of all ---encrypt-to keys.
+
+@item -v, ---verbose
+Give more information during processing. If used
+twice, the input data is listed in detail.
+
+@item -q, ---quiet
+Try to be as quiet as possible.
+
+@item -z @code{n}
+Set compression level to @code{n}. A value of 0 for @code{n}
+disables compression. Default is to use the default
+compression level of zlib (normally 6).
+
+@item -t, ---textmode
+Use canonical text mode. If -t (but not
+---textmode) is used together with armoring
+and signing, this enables clearsigned messages.
+This kludge is needed for PGP compatibility;
+normally you would use ---sign or --clearsign
+to selected the type of the signature.
+
+@item -n, ---dry-run
+Don't make any changes (this is not completely implemented).
+
+@item -i, ---interactive
+Prompt before overwriting any files.
+
+@item ---batch
+Use batch mode. Never ask, do not allow interactive
+commands.
+
+@item ---no-tty
+Make sure that the TTY (terminal) is never used for any output.
+This option is needed in some cases because GnuPG sometimes prints
+warnings to the TTY if ---batch is used.
+
+@item ---no-batch
+Disable batch mode. This may be of use if ---batch
+is enabled from an options file.
+
+@item ---yes
+Assume "yes" on most questions.
+
+@item ---no
+Assume "no" on most questions.
+
+@item ---always-trust
+Skip key validation and assume that used keys are always fully trusted.
+You won't use this unless you have installed some external validation scheme.
+
+@item ---keyserver @code{name}
+Use @code{name} to lookup keys which are not yet in
+your keyring. This is only done while verifying
+messages with signatures. The option is also
+required for the command ---send-keys to
+specify the keyserver to where the keys should
+be send. All keyservers synchronize with each
+other - so there is no need to send keys to more
+than one server. Using the command
+"host -l pgp.net | grep wwwkeys" gives you a
+list of keyservers. Because there is load
+balancing using round-robin DNS you may notice
+that you get different key servers.
+
+@item ---no-auto-key-retrieve
+This option disables the automatic retrieving of keys from a keyserver
+while verifying signatures. This option allows you to keep a keyserver in
+the options file for the ---send-keys and --recv-keys commands.
+
+@item ---honor-http-proxy
+Try to access the keyserver over the proxy set with the variable
+"http_proxy".
+
+@item ---keyring @code{file}
+Add @code{file} to the list of keyrings.
+If @code{file} begins with a tilde and a slash, these
+are replaced by the HOME directory. If the filename
+does not contain a slash, it is assumed to be in the
+home-directory ("~/.gnupg" if ---homedir is not used).
+The filename may be prefixed with a scheme:
+
+"gnupg-ring:" is the default one.
+
+"gnupg-gdbm:" may be used for a GDBM ring. Note that GDBM
+is experimental and likely to be removed in future versions.
+
+It might make sense to use it together with ---no-default-keyring.
+
+@item ---secret-keyring @code{file}
+Same as ---keyring but for the secret keyrings.
+
+@item ---homedir @code{directory}
+Set the name of the home directory to @code{directory} If this
+option is not used it defaults to "~/.gnupg". It does
+not make sense to use this in a options file. This
+also overrides the environment variable "GNUPGHOME".
+
+@item ---charset @code{name}
+Set the name of the native character set. This is used
+to convert some strings to proper UTF-8 encoding.
+Valid values for @code{name} are:
+
+@table @asis
+@item iso-8859-1
+This is the default Latin 1 set.
+
+@item iso-8859-2
+The Latin 2 set.
+
+@item koi8-r
+The usual Russian set (rfc1489).
+
+@item utf-8
+Bypass all translations and assume
+that the OS uses native UTF-8 encoding.
+
+@end table
+
+@item ---utf8-strings
+@itemx ---no-utf8-strings
+Assume that the arguments are already given as UTF8 strings. The default
+(---no-utf8-strings)
+is to assume that arguments are encoded in the character set as specified
+by ---charset. These options affect all following arguments. Both options may
+be used multiple times.
+
+@item ---options @code{file}
+Read options from @code{file} and do not try to read
+them from the default options file in the homedir
+(see ---homedir). This option is ignored if used
+in an options file.
+
+@item ---no-options
+Shortcut for "---options /dev/null". This option is
+detected before an attempt to open an option file.
+
+@item ---load-extension @code{name}
+Load an extension module. If @code{name} does not
+contain a slash it is searched in "/usr/local/lib/gnupg"
+See the manual for more information about extensions.
+
+@item ---debug @code{flags}
+Set debugging flags. All flags are or-ed and @code{flags} may
+be given in C syntax (e.g. 0x0042).
+
+@item ---debug-all
+Set all useful debugging flags.
+
+@item ---status-fd @code{n}
+Write special status strings to the file descriptor @code{n}.
+See the file DETAILS in the documentation for a listing of them.
+
+@item ---logger-fd @code{n}
+Write log output to file descriptor @code{n} and not to stderr.
+
+@item ---no-comment
+Do not write comment packets. This option affects only
+the generation of secret keys. Please note, that this has nothing
+to do with the comments in clear text signatures.
+
+@item ---comment @code{string}
+Use @code{string} as comment string in clear text signatures.
+To suppress those comment strings entirely, use an empty string here.
+
+@item ---default-comment
+Force to write the standard comment string in clear
+text signatures. Use this to overwrite a ---comment
+from a config file.
+
+@item ---no-version
+Omit the version string in clear text signatures.
+
+@item ---emit-version
+Force to write the version string in clear text
+signatures. Use this to overwrite a previous
+---no-version from a config file.
+
+@item -N, ---notation-data @code{name=value}
+Put the name value pair into the signature as notation data.
+@code{name} must consist only of alphanumeric characters, digits
+or the underscore; the first character must not be a digit.
+@code{value} may be any printable string; it will be encoded in UTF8,
+so you should check that your ---charset is set correctly.
+If you prefix @code{name} with an exclamation mark, the notation
+data will be flagged as critical (rfc2440:5.2.3.15).
+
+@item ---set-policy-url @code{string}
+Use @code{string} as Policy URL for signatures (rfc2440:5.2.3.19).
+If you prefix it with an exclamation mark, the policy URL
+packet will be flagged as critical.
+
+@item ---set-filename @code{string}
+Use @code{string} as the name of file which is stored in
+messages.
+
+@item ---use-embedded-filename
+Try to create a file with a name as embedded in the data.
+This can be a dangerous option as it allows to overwrite files.
+
+@item ---completes-needed @code{n}
+Number of completely trusted users to introduce a new
+key signer (defaults to 1).
+
+@item ---marginals-needed @code{n}
+Number of marginally trusted users to introduce a new
+key signer (defaults to 3)
+
+@item ---max-cert-depth @code{n}
+Maximum depth of a certification chain (default is 5).
+
+@item ---cipher-algo @code{name}
+Use @code{name} as cipher algorithm. Running the program
+with the command ---version yields a list of supported
+algorithms. If this is not used the cipher algorithm is
+selected from the preferences stored with the key.
+
+@item ---digest-algo @code{name}
+Use @code{name} as message digest algorithm. Running the
+program with the command ---version yields a list of
+supported algorithms. Please note that using this
+option may violate the OpenPGP requirement, that a
+160 bit hash is to be used for DSA.
+
+@item ---s2k-cipher-algo @code{name}
+Use @code{name} as the cipher algorithm used to protect secret
+keys. The default cipher is BLOWFISH. This cipher is
+also used for conventional encryption if ---cipher-algo
+is not given.
+
+@item ---s2k-digest-algo @code{name}
+Use @code{name} as the digest algorithm used to mangle the
+passphrases. The default algorithm is RIPE-MD-160.
+This digest algorithm is also used for conventional
+encryption if ---digest-algo is not given.
+
+@item ---s2k-mode @code{n}
+Selects how passphrases are mangled. If @code{n} is 0
+a plain passphrase (which is not recommended) will be used,
+a 1 (default) adds a salt to the passphrase and
+a 3 iterates the whole process a couple of times.
+Unless ---rfc1991 is used, this mode is also used
+for conventional encryption.
+
+@item ---compress-algo @code{n}
+Use compress algorithm @code{n}. Default is 2 which is
+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
+preferences; note, that this can't be done if you do
+not encrypt the data.
+
+@item ---disable-cipher-algo @code{name}
+Never allow the use of @code{name} as cipher algorithm.
+The given name will not be checked so that a later loaded algorithm
+will still get disabled.
+
+@item ---disable-pubkey-algo @code{name}
+Never allow the use of @code{name} as public key algorithm.
+The given name will not be checked so that a later loaded algorithm
+will still get disabled.
+
+@item ---no-sig-cache
+Do not cache the verification status of key signatures.
+Caching gives a much better performance in key listings. However, if
+you suspect that your public keyring is not save against write
+modifications, you can use this option to disable the caching. It
+probably does not make sense to disable it because all kind of damage
+can be done if someone else has write access to your public keyring.
+
+@item ---no-sig-create-check
+GnuPG normally verifies each signature right after creation to protect
+against bugs and hardware malfunctions which could leak out bits from
+the secret key. This extra verification needs some time (about 115%
+for DSA keys), and so this option can be used to disable it.
+However, due to the fact that the signature creation needs manual
+interaction, this performance penalty does not matter in most settings.
+
+@item ---throw-keyid
+Do not put the keyid into encrypted packets. This option
+hides the receiver of the message and is a countermeasure
+against traffic analysis. It may slow down the decryption
+process because all available secret keys are tried.
+
+@item ---not-dash-escaped
+This option changes the behavior of cleartext signatures
+so that they can be used for patch files. You should not
+send such an armored file via email because all spaces
+and line endings are hashed too. You can not use this
+option for data which has 5 dashes at the beginning of a
+line, patch files don't have this. A special armor header
+line tells GnuPG about this cleartext signature option.
+
+@item ---escape-from-lines
+Because some mailers change lines starting with "From "
+to "<From " it is good to handle such lines in a special
+way when creating cleartext signatures. All other PGP
+versions do it this way too. This option is not enabled
+by default because it would violate rfc2440.
+
+@item ---passphrase-fd @code{n}
+Read the passphrase from file descriptor @code{n}. If you use
+0 for @code{n}, the passphrase will be read from stdin. This
+can only be used if only one passphrase is supplied.
+Don't use this option if you can avoid it.
+
+@item ---command-fd @code{n}
+This is a replacement for the deprecated shared-memory IPC mode.
+If this option is enabled, user input on questions is not expected
+from the TTY but from the given file descriptor. It should be used
+together with ---status-fd. See the file doc/DETAILS in the source
+distribution for details on how to use it.
+
+@item ---use-agent
+Try to use the GnuPG-Agent. Please note that this agent is still under
+development. With this option, GnuPG first tries to connect to the
+agent before it asks for a passphrase.
+
+@item ---rfc1991
+Try to be more RFC1991 (PGP 2.x) compliant.
+
+@item ---openpgp
+Reset all packet, cipher and digest options to OpenPGP
+behavior. Use this option to reset all previous
+options like ---rfc1991, --force-v3-sigs, --s2k-*,
+---cipher-algo, --digest-algo and --compress-algo to
+OpenPGP compliant values. All PGP workarounds are also
+disabled.
+
+@item ---force-v3-sigs
+OpenPGP states that an implementation should generate
+v4 signatures but PGP 5.x recognizes v4 signatures only
+on key material. This option forces v3 signatures for
+signatures on data.
+
+@item ---force-mdc
+Force the use of encryption with appended manipulation
+code. This is always used with the newer ciphers (those
+with a blocksize greater than 64 bit).
+This option might not be implemented yet.
+
+@item ---allow-non-selfsigned-uid
+Allow the import of keys with user IDs which are not self-signed, but
+have at least one signature.
+This only allows the import - key validation will fail and you
+have to check the validity of the key my other means. This hack is
+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.
+
+@item ---allow-freeform-uid
+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.
+
+@item ---ignore-time-conflict
+GnuPG normally checks that the timestamps associated with keys and
+signatures have plausible values. However, sometimes a signature seems to
+be older than the key due to clock problems. This option makes these
+checks just a warning.
+
+@item ---ignore-crc-error
+The ASCII armor used by OpenPG is protected by a CRC checksum against
+transmission errors. Sometimes it happens that the CRC gets mangled
+somewhere on the transmission channel 
+but the actual content (which is anyway protected by
+the OpenPGP protocol) is still okay. This option will let gpg ignore
+CRC errors.
+
+@item ---lock-once
+Lock the databases the first time a lock is requested
+and do not release the lock until the process
+terminates.
+
+@item ---lock-multiple
+Release the locks every time a lock is no longer
+needed. Use this to override a previous ---lock-once
+from a config file.
+
+@item ---lock-never
+Disable locking entirely. This option should be used only in very
+special environments, where it can be assured that only one process
+is accessing those files. A bootable floppy with a stand-alone
+encryption system will probably use this. Improper usage of this
+option may lead to data and key corruption.
+
+@item ---no-random-seed-file
+GnuPG uses a file to store its internal random pool over invocations.
+This makes random generation faster; however sometimes write operations
+are not desired. This option can be used to achieve that with the cost of
+slower random generation.
+
+@item ---no-verbose
+Reset verbose level to 0.
+
+@item ---no-greeting
+Suppress the initial copyright message but do not
+enter batch mode.
+
+@item ---no-secmem-warning
+Suppress the warning about "using insecure memory".
+
+@item ---no-armor
+Assume the input data is not in ASCII armored format.
+
+@item ---no-default-keyring
+Do not add the default keyrings to the list of
+keyrings.
+
+@item ---skip-verify
+Skip the signature verification step. This may be
+used to make the decryption faster if the signature
+verification is not needed.
+
+@item ---with-colons
+Print key listings delimited by colons.
+
+@item ---with-key-data
+Print key listings delimited by colons and print the public key data.
+
+@item ---with-fingerprint
+Same as the command ---fingerprint but changes only the format of the output
+and may be used together with another command.
+
+@item ---fast-list-mode
+Changes the output of the list commands to work faster; this is achieved
+by leaving some parts empty. Some applications don't need the user ID and
+the trust information given in the listings. By using this options they
+can get a faster listing. The exact behaviour of this option may change
+in future versions.
+
+@item ---fixed-list-mode
+Do not merge user ID and primary key in ---with-colon listing mode and
+print all timestamps as seconds since 1970-01-01.
+
+@item ---list-only
+Changes the behaviour of some commands. This is like ---dry-run but
+different in some cases. The semantic of this command may be extended in
+the future. Currently it only skips the actual decryption pass and
+therefore enables a fast listing of the encryption keys.
+
+@item ---no-literal
+This is not for normal use. Use the source to see for what it might be useful.
+
+@item ---set-filesize
+This is not for normal use. Use the source to see for what it might be useful.
+
+@item ---emulate-md-encode-bug
+GnuPG versions prior to 1.0.2 had a bug in the way a signature was encoded.
+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.
+
+@item ---show-session-key
+Display the session key used for one message. See ---override-session-key
+for the counterpart of this option.
+
+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.
+
+@item ---override-session-key @code{string} 
+Don't use the public key but the session key @code{string}. 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.
+
+@item ---merge-only
+Don't insert new keys into the keyrings while doing an import.
+
+@item ---allow-secret-key-import
+Allow import of secret keys. The import command normally skips secret
+keys because a secret key can otherwise be used to attack the trust
+calculation.
+
+@item ---try-all-secrets
+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.
+
+@item ---enable-special-filenames
+This options enables a mode in which filenames of the form
+@file{-&n}, where n is a non-negative decimal number,
+refer to the file descriptor n and not to a file with that name.
+
+@item ---no-expensive-trust-checks
+Experimental use only.
+
+@end table
+
+@majorheading How to specify a user ID
+There are different ways on how to specify a user ID to GnuPG;
+here are some examples:
+
+@table @asis
+@item 
+@item 234567C4
+@itemx 0F34E556E
+@itemx 01347A56A
+@itemx 0xAB123456
+Here the key ID is given in the usual short form.
+
+@item 234AABBCC34567C4
+@itemx 0F323456784E56EAB
+@itemx 01AB3FED1347A5612
+@itemx 0x234AABBCC34567C4
+Here the key ID is given in the long form as used by OpenPGP.
+
+@item 1234343434343434C434343434343434
+@itemx 123434343434343C3434343434343734349A3434
+@itemx 0E12343434343434343434EAB3484343434343434
+@itemx 0xE12343434343434343434EAB3484343434343434
+The best way to specify a key ID is by using the fingerprint of
+the key. This avoids any ambiguities in case that there are duplicated
+key IDs (which are really rare for the long key IDs).
+
+@item =Heinrich Heine <heinrichh@@uni-duesseldorf.de>
+Using an exact to match string. The equal sign indicates this.
+
+@item <heinrichh@@uni-duesseldorf.de>
+Using the email address part which must match exactly. The left angle bracket
+indicates this email address mode.
+
+@item +Heinrich Heine duesseldorf
+All words must match exactly (not case sensitive) but can appear in
+any order in the user ID. Words are any sequences of letters,
+digits, the underscore and all characters with bit 7 set.
+
+@item #34
+Using the Local ID. This is a very low level method and should
+only be used by applications which really need it. The hash character
+indicates this method. An application should not assume that this is
+only a number.
+
+@item Heine
+@itemx *Heine
+By case insensitive substring matching. This is the default mode but
+applications may want to explicitly indicate this by putting the asterisk
+in front.
+
+@end table
+
+Note that you can append an exclamation mark to key IDs or
+fingerprints. This flag which tells GnuPG to use exactly
+that primary or secondary key and don't try to figure out which 
+secondary or primary key to use.
+
+@majorheading RETURN VALUE
+The program returns 0 if everything was fine, 1 if at least
+a signature was bad, and other error codes for fatal errors.
+
+@majorheading EXAMPLES
+@table @asis
+@item gpg -se -r @code{Bob} @code{file}
+sign and encrypt for user Bob
+
+@item gpg ---clearsign @code{file}
+make a clear text signature
+
+@item gpg -sb @code{file}
+make a detached signature
+
+@item gpg ---list-keys @code{user_ID}
+show keys
+
+@item gpg ---fingerprint @code{user_ID}
+show fingerprint
+
+@item gpg ---verify @code{pgpfile}
+@itemx gpg ---verify @code{sigfile} @code{files}
+Verify the signature of the file but do not output the data. The second form
+is used for detached signatures, where @code{sigfile} is the detached
+signature (either ASCII armored of binary) and @code{files} are the signed
+data; if this is not given the name of the file holding the signed data is
+constructed by cutting off the extension (".asc" or ".sig") of
+@code{sigfile} or by asking the user for the filename.
+
+@end table
+
+@majorheading ENVIRONMENT
+@table @asis
+@item HOME
+Used to locate the default home directory.
+
+@item GNUPGHOME
+If set directory used instead of "~/.gnupg".
+
+@item http_proxy
+Only honored when the option ---honor-http-proxy is set.
+
+@end table
+
+@majorheading FILES
+@table @asis
+@item ~/.gnupg/secring.gpg
+The secret keyring
+
+@item ~/.gnupg/secring.gpg.lock
+and the lock file
+
+@item ~/.gnupg/pubring.gpg
+The public keyring
+
+@item ~/.gnupg/pubring.gpg.lock
+and the lock file
+
+@item ~/.gnupg/trustdb.gpg
+The trust database
+
+@item ~/.gnupg/trustdb.gpg.lock
+and the lock file
+
+@item ~/.gnupg/random_seed
+used to preserve the internal random pool
+
+@item ~/.gnupg/options
+May contain options
+
+@item /usr[/local]/share/gnupg/options.skel
+Skeleton options file
+
+@item /usr[/local]/lib/gnupg/
+Default location for extensions
+
+@end table
+
+@majorheading WARNINGS
+Use a *good* password for your user account and a *good* passphrase
+to protect your secret key. This passphrase is the weakest part of the
+whole system. Programs to do dictionary attacks on your secret keyring
+are very easy to write and so you should protect your "~/.gnupg/"
+directory very well.
+
+Keep in mind that, if this program is used over a network (telnet), it
+is *very* easy to spy out your passphrase!
+
+If you are going to verify detached signatures, make sure that the
+program nows about it; either be giving both filenames on the
+commandline or using @samp{-} to specify stdin.
+
+@majorheading BUGS
+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. 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.
+
+@bye
diff -urN gnupg-1.0.4/doc/gpgv.1 gnupg-1.0.5/doc/gpgv.1
--- gnupg-1.0.4/doc/gpgv.1	Thu Oct 12 12:00:07 2000
+++ gnupg-1.0.5/doc/gpgv.1	Sat Apr 28 20:40:44 2001
@@ -55,12 +55,12 @@
 .ta 8n 16n 24n 32n 40n 48n 56n 64n 72n  
 .TH "gpgv" "1" 
 .SH "NAME" 
-gpg \(em signature verification tool 
+gpgv \(em signature verification tool 
 .SH "SYNOPSIS" 
 .PP 
 .nf 
 .ta 8n 16n 24n 32n 40n 48n 56n 64n 72n 
-\fBgpg\fP  [\fBoptions\fR]  [\fBsigned files\fR]    
+\fBgpgv\fP  [\fBoptions\fR]  [\fBsigned files\fR]    
 .fi 
 .SH "DESCRIPTION" 
 .PP 
@@ -138,4 +138,4 @@
 .SH "FILES" 
 .IP "~/.gnupg/trustedkeys.gpg" 10 
 The default keyring with the allowed keys 
-...\" created by instant / docbook-to-man, Thu 12 Oct 2000, 12:00 
+...\" created by instant / docbook-to-man, Sat 28 Apr 2001, 20:40 
diff -urN gnupg-1.0.4/doc/gpgv.info gnupg-1.0.5/doc/gpgv.info
--- gnupg-1.0.4/doc/gpgv.info	Thu Jan  1 01:00:00 1970
+++ gnupg-1.0.5/doc/gpgv.info	Sat Apr 28 20:40:40 2001
@@ -0,0 +1,119 @@
+This is gpgv.info, produced by makeinfo version 4.0 from gpgv.texi.
+
+
+File: gpgv.info,  Node: Top,  Up: (dir)
+
+gpgv
+****
+
+* Menu:
+
+Name
+****
+
+   gpgv --- signature verification tool
+
+Synopsis
+********
+
+DESCRIPTION
+***********
+
+   `gpgv' is the OpenPGP signature checking tool.
+
+   This program is a stripped down version of `gpg' which is only able
+to check signatures. It is somewhat smaller than the full blown `gpg'
+and uses a different (and more simple way) to check that the public
+keys used to made the signature are trustworth. There is no options
+files and only very few options are implemented.
+
+   `gpgv' assumes that all keys in the keyring are trustworty.  It uses
+by default a keyring named `trustedkeys.gpg' which is assumed to be in
+the home directory as defined by GnuPG or set by an option or an
+environment variable. An option may be used to specify another keyring
+or even multiple keyrings.
+
+OPTIONS
+*******
+
+   `gpgv' recognizes these options:
+
+-v, --verbose
+     Give more information during processing. If used twice, the input
+     data is listed in detail.
+
+-q, --quiet
+     Try to be as quiet as possible.
+
+--keyring `file'
+     Add `file' to the list of keyrings.  If `file' begins with a tilde
+     and a slash, these are replaced by the HOME directory. If the
+     filename does not contain a slash, it is assumed to be in the
+     home-directory ("~/.gnupg" if --homedir is not used).  The
+     filename may be prefixed with a scheme:
+
+     "gnupg-ring:" is the default one.
+
+     "gnupg-gdbm:" may be used for a GDBM ring. Note that GDBM is
+     experimental and likely to be removed in future versions.
+
+     It might make sense to use it together with --no-default-keyring.
+
+--homedir `directory'
+     Set the name of the home directory to `directory' If this option
+     is not used it defaults to "~/.gnupg". It does not make sense to
+     use this in a options file. This also overrides the environment
+     variable "GNUPGHOME".
+
+--status-fd `n'
+     Write special status strings to the file descriptor `n'.  See the
+     file DETAILS in the documentation for a listing of them.
+
+--logger-fd `n'
+     Write log output to file descriptor `n' and not to stderr.
+
+--ignore-time-conflict
+     GnuPG normally checks that the timestamps associated with keys and
+     signatures have plausible values. However, sometimes a signature
+     seems to be older than the key due to clock problems. This option
+     makes these checks just a warning.
+
+RETURN VALUE
+************
+
+   The program returns 0 if everything was fine, 1 if at least one
+signature was bad, and other error codes for fatal errors.
+
+EXAMPLES
+********
+
+gpgv `pgpfile'
+gpgv `sigfile' `files'
+     Verify the signature of the file. The second form is used for
+     detached signatures, where `sigfile' is the detached signature
+     (either ASCII armored or binary) and `files' are the signed data;
+     if this is not given the name of the file holding the signed data
+     is constructed by cutting off the extension (".asc", ".sig" or
+     ".sign") from `sigfile'.
+
+ENVIRONMENT
+***********
+
+HOME
+     Used to locate the default home directory.
+
+GNUPGHOME
+     If set directory used instead of "~/.gnupg".
+
+FILES
+*****
+
+~/.gnupg/trustedkeys.gpg
+     The default keyring with the allowed keys
+
+
+
+Tag Table:
+Node: Top69
+
+End Tag Table
diff -urN gnupg-1.0.4/doc/gpgv.sgml gnupg-1.0.5/doc/gpgv.sgml
--- gnupg-1.0.4/doc/gpgv.sgml	Wed Oct  4 15:34:57 2000
+++ gnupg-1.0.5/doc/gpgv.sgml	Sat Apr 28 20:21:45 2001
@@ -1,5 +1,5 @@
 <!-- gpgv.sgml - the man page for GnuPG
-    Copyright (C) 2000 Free Software Foundation, Inc.
+    Copyright (C) 2000, 2001 Free Software Foundation, Inc.
 
     This file is part of GnuPG.
 
@@ -45,19 +45,19 @@
 <!entity ParmNameValue	"<parameter>name=value</parameter>">
 ]>
 
-<refentry id="gpgb">
+<refentry id="gpgv">
 <refmeta>
   <refentrytitle>gpgv</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="gnu">GNU Tools</refmiscinfo>
 </refmeta>
 <refnamediv>
-  <refname/gpg/
+  <refname/gpgv/
   <refpurpose>signature verification tool</>
 </refnamediv>
 <refsynopsisdiv>
   <synopsis>
-<command>gpg</>
+<command>gpgv</>
  <optional><parameter/options/</optional>
  <optional><parameter/signed files/</optional>
   </synopsis>
diff -urN gnupg-1.0.4/doc/gpgv.texi gnupg-1.0.5/doc/gpgv.texi
--- gnupg-1.0.4/doc/gpgv.texi	Thu Jan  1 01:00:00 1970
+++ gnupg-1.0.5/doc/gpgv.texi	Sat Apr 28 20:40:40 2001
@@ -0,0 +1,118 @@
+\input texinfo
+@c This Texinfo document has been automatically generated by
+@c docbook2texi from a DocBook documentation.  The tool used
+@c can be found at:
+@c <URL:http://shell.ipoline.com/~elmert/hacks/docbook2X/>
+@c Please send any bug reports, improvements, comments, 
+@c patches, etc. to Steve Cheng <steve@ggi-project.org>.
+
+@setfilename gpgv.info
+
+@node top
+@top gpgv
+@menu
+@end menu
+
+@majorheading Name
+gpgv ---- signature verification tool
+
+@majorheading Synopsis
+
+@majorheading DESCRIPTION
+@code{gpgv} is the OpenPGP signature checking tool.
+
+This program is a stripped down version of @code{gpg} which is only
+able
+to check signatures. It is somewhat smaller than the full blown
+@code{gpg} and uses a different (and more simple way) to check that
+the public keys used to made the signature are trustworth. There is
+no options files and only very few options are implemented.
+
+@code{gpgv} assumes that all keys in the keyring are trustworty.
+It uses by default a keyring named @file{trustedkeys.gpg} which is
+assumed to be in the home directory as defined by GnuPG or set by an
+option or an environment variable. An option may be used to specify
+another keyring or even multiple keyrings.
+
+@majorheading OPTIONS
+@code{gpgv} recognizes these options:
+
+@table @asis
+@item -v, ---verbose
+Give more information during processing. If used
+twice, the input data is listed in detail.
+
+@item -q, ---quiet
+Try to be as quiet as possible.
+
+@item ---keyring @code{file}
+Add @code{file} to the list of keyrings.
+If @code{file} begins with a tilde and a slash, these
+are replaced by the HOME directory. If the filename
+does not contain a slash, it is assumed to be in the
+home-directory ("~/.gnupg" if ---homedir is not used).
+The filename may be prefixed with a scheme:
+
+"gnupg-ring:" is the default one.
+
+"gnupg-gdbm:" may be used for a GDBM ring. Note that GDBM
+is experimental and likely to be removed in future versions.
+
+It might make sense to use it together with ---no-default-keyring.
+
+@item ---homedir @code{directory}
+Set the name of the home directory to @code{directory} If this
+option is not used it defaults to "~/.gnupg". It does
+not make sense to use this in a options file. This
+also overrides the environment variable "GNUPGHOME".
+
+@item ---status-fd @code{n}
+Write special status strings to the file descriptor @code{n}.
+See the file DETAILS in the documentation for a listing of them.
+
+@item ---logger-fd @code{n}
+Write log output to file descriptor @code{n} and not to stderr.
+
+@item ---ignore-time-conflict
+GnuPG normally checks that the timestamps associated with keys and
+signatures have plausible values. However, sometimes a signature seems to
+be older than the key due to clock problems. This option makes these
+checks just a warning.
+
+@end table
+
+@majorheading RETURN VALUE
+The program returns 0 if everything was fine, 1 if at least
+one signature was bad, and other error codes for fatal errors.
+
+@majorheading EXAMPLES
+@table @asis
+@item gpgv @code{pgpfile}
+@itemx gpgv @code{sigfile} @code{files}
+Verify the signature of the file. The second form
+is used for detached signatures, where @code{sigfile} is the detached
+signature (either ASCII armored or binary) and @code{files} are the signed
+data; if this is not given the name of the file holding the signed data is
+constructed by cutting off the extension (".asc", ".sig" or ".sign") from
+@code{sigfile}.
+
+@end table
+
+@majorheading ENVIRONMENT
+@table @asis
+@item HOME
+Used to locate the default home directory.
+
+@item GNUPGHOME
+If set directory used instead of "~/.gnupg".
+
+@end table
+
+@majorheading FILES
+@table @asis
+@item ~/.gnupg/trustedkeys.gpg
+The default keyring with the allowed keys
+
+@end table
+
+@bye
diff -urN gnupg-1.0.4/g10/ChangeLog gnupg-1.0.5/g10/ChangeLog
--- gnupg-1.0.4/g10/ChangeLog	Mon Oct 16 19:12:23 2000
+++ gnupg-1.0.5/g10/ChangeLog	Sat Apr 28 20:16:28 2001
@@ -1,3 +1,549 @@
+2001-04-28  Werner Koch  <wk@gnupg.org>
+
+	* getkey.c (merge_public_with_secret): pkttype was not set to subkey.
+
+2001-04-27  Werner Koch  <wk@gnupg.org>
+
+	* skclist.c (build_sk_list): Changed one log_debug to log_info.
+
+2001-04-25  Werner Koch  <wk@gnupg.org>
+
+	* keyedit.c (show_prefs): Add a verbose mode.
+	(show_key_with_all_names): Pass verbose flag for special value of
+	with_pref.
+	(keyedit_menu): New command "showpref"
+	(show_key_with_all_names): Mark revoked uids and the primary key.
+
+2001-04-24  Werner Koch  <wk@gnupg.org>
+
+	* getkey.c (get_primary_uid): Return a different string in case of
+	error and made it translatable.
+
+	* build-packet.c (do_secret_key): Ugly, we wrote a zero
+	instead of the computed ndays.  Thanks to M Taylor for complaining
+	about a secret key import problem.
+
+2001-04-23  Werner Koch  <wk@gnupg.org>
+
+	* hkp.c (hkp_ask_import): Allow to specify a port number for the 
+	keyserver.  Add a kudge to set the no_shutdown flag.
+	(hkp_export): Ditto.
+	* options.skel: Document the changes 
+
+2001-04-20  Werner Koch  <wk@gnupg.org>
+
+	* options.skel: Add some more comments.
+
+2001-04-19  Werner Koch  <wk@gnupg.org>
+
+	* keyid.c (mk_datestr): New.  Handles negative times.  We must do
+	this because Windoze segvs on negative times passed to gmtime().
+	Changed all datestr_from function to use this one.
+
+	* keyid.c, keyid.h (colon_strtime): New. To implement the
+	fixed-list-mode.
+	(colon_datestr_from_pk): New.
+	(colon_datestr_from_sk): New.
+	(colon_datestr_from_sig): New.
+	* keylist.c (list_keyblock_colon): Use these functions here.
+	* mainproc.c (list_node): Ditto.
+
+2001-04-18  Werner Koch  <wk@gnupg.org>
+
+	* openfile.c (open_sigfile): Fixed the handling of ".sign".
+	* mainproc.c (proc_tree): Use iobuf_get_real_fname.
+	Both are by Vincent Broman.
+
+2001-04-14  Werner Koch  <wk@gnupg.org>
+
+	* getkey.c (fixup_uidnode): Removed check for !sig which is
+	pointless here.  Thanks to Jan Niehusmann.
+
+2001-04-10  Werner Koch  <wk@gnupg.org>
+
+	* sig-check.c (check_key_signature2): Use log_info instead of
+	log_error so that messed up keys do not let gpg return an error.
+	Suggested by Christian Kurz.
+
+	* getkey.c (merge_selfsigs_main): Do a fixup_uidnode only if we
+	have both, uid and sig.  Thanks to M Taylor.
+
+2001-04-05  Werner Koch  <wk@gnupg.org>
+
+	* armor.c (unarmor_pump_new,unarmor_pump_release): New.
+	(unarmor_pump): New. 
+	* pipemode.c (pipemode_filter): Use the unarmor_pump to handle
+	armored or non-armored detached signatures.  We can't use the
+	regular armor_filter becuase this does only chack for armored
+	signatures the very first time.  In pipemode we may have a mix of
+	armored and binary detached signatures.
+	* mainproc.c (proc_tree): Do not print the "old style" notice when
+	this is a pipemode processes detached signature.
+	(proc_plaintext): Special handling of pipemode detached sigs.
+
+	* packet.h (CTRLPKT_PLAINTEXT_MARK): New.
+	* parse-packet.c (create_gpg_control): New.
+	* kbnode.c (dump_kbnode): Support it here.
+	* mainproc.c (check_sig_and_print): Fixed the check for bad
+	sequences of multiple signatures.
+	(proc_plaintext): Add the marker packet.
+	(proc_tree): We can now check multiple detached signatures.
+
+2001-04-02  Werner Koch  <wk@gnupg.org>
+
+	The length of encrypted packets for blocksizes != 8 was not
+	correct encoded.  I think this is a minor problem, because we
+	usually use partial length packets.  Kudos to Kahil D. Jallad for
+	pointing this out.
+	* packet.h: Add extralen to PKT_encrypted.
+	* cipher.c (write_header): Set extralen.
+	* build-packet.c (do_encrypted): Use extralen instead of const 10.
+	(do_encrypted_mdc): Ditto.
+	* parse-packet.c (parse_encrypted): Set extralen to 0 becuase we
+	don't know it here.
+
+2001-03-30  Werner Koch  <wk@gnupg.org>
+
+	* getkey.c (premerge_public_with_secret): Changed wording an add
+	the keyID to the info message.
+
+2001-03-29  Werner Koch  <wk@gnupg.org>
+
+	* getkey.c (premerge_public_with_secret): Use log_info instead of
+	log_error when no secret key was found for a public one.
+	Fix the usage if the secret parts of a key are not available.
+
+	* openfile.c (ask_outfile_name): Trim spaces.
+	(open_outfile): Allow to enter an alternate filename.  Thanks to
+	Stefan Bellon.
+	* plaintext.c (handle_plaintext): Ditto.
+
+2001-03-28  Werner Koch  <wk@gnupg.org>
+
+	* mainproc.c (do_check_sig): Allow direct key and subkey
+	revocation signature.
+	* sig-check.c (check_key_signature2): Check direct key signatures.
+	Print the signature class along with an error.
+
+2001-03-27  Werner Koch  <wk@gnupg.org>
+
+	* packet.h: Add a missing typedef to an enum.  Thanks to Stefan Bellon.
+
+	* g10.c: New option --no-sig-create-check.
+	* sign.c (do_sign): Implement it here.
+	* g10.c: New option --no-sig-cache.
+	* sig-check.c (check_key_signature2): Implement it here.
+	(cache_selfsig_result): and here.
+
+	* keylist.c (list_keyblock): Removed debugging stuff.
+
+	* getkey.c (cache_public_key): Made global.
+	* keygen.c (write_selfsig, write_keybinding): Cache the new key.
+
+	* getkey.c (key_byname): Add new arg secmode and changed all
+	callers to request explicitly the mode.  Deriving this information
+	from the other supplied parameters does not work if neither pk nor
+	sk are supplied.
+
+2001-03-25  Werner Koch  <wk@gnupg.org>
+
+	* packet.h (ctrlpkttype_t): New.
+	* mainproc.c (add_gpg_control,proc_plaintext,proc_tree): Use the
+	new enum values.
+	* pipemode.c (make_control): Ditto.
+	* armor.c (armor_filter): Ditto.
+
+2001-03-24  Werner Koch  <wk@gnupg.org>
+
+	* sign.c (do_sign): Verify the signature right after creation.
+
+2001-03-23  Werner Koch  <wk@gnupg.org>
+
+	* status.c, status.h (STATUS_UNEXPECTED): New.
+	* mainproc.c (do_proc_packets): And emit it here.
+
+2001-03-21  Werner Koch  <wk@gnupg.org>
+
+	* status.c: Add sys/types.h so that it runs on Ultrix.  Reported
+	by Georg Schwarz.x
+
+	* build-packet.c (build_sig_subpkt): Fixed generaton of packet
+	length header in case where 2 bytes headers are needed.  Thanks to
+	Piotr Krukowiecki.
+
+2001-03-19  Werner Koch  <wk@gnupg.org>
+
+	* g10.c (main): the default keyring is no always used unless
+	--no-default-keyring is given.  
+
+	* ringedit.c (add_keyblock_resource): invalidate cache after file
+	creation.
+
+2001-03-15  Werner Koch  <wk@gnupg.org>
+
+	* keygen.c (ask_algo): Changed the warning of the ElGamal S+E Algo.
+
+	* keylist.c (print_capabilities): New.
+	(list_keyblock_colon): and use it here.
+
+2001-03-13  Werner Koch  <wk@gnupg.org>
+
+	* main.c, options.h: New option --fixed_list_mode.
+	* keylist.c (list_keyblock_colon): use it here.
+
+	* getkey.c (merge_keys_and_selfsig): Divert merging of public keys
+	to the function used in key selection..
+	* keylist.c (is_uid_valid): Removed.
+	(list_keyblock): Splitted into ..
+	(list_keyblock_print, list_keyblock_colon): .. these.
+	functions.  Changed them to use the flags set in the key lookup code.
+	(reorder_keyblock): New, so that primary user IDs are listed first.
+
+	* ringedit.c (keyring_copy): flush the new iobuf chaces before
+	rename or remove operations.  This is mainly needed for W32.
+
+	* hkp.c [HAVE_DOSISH_SYSTEM]: Removed the disabled code because we
+	have now W32 socket support in ../util/http.c
+
+	* skclist.c (key_present_in_sk_list): New.
+	(is_duplicated_entry): New.
+	(build_sk_list): Check for duplicates and do that before unlocking.
+
+2001-03-12  Werner Koch  <wk@gnupg.org>
+
+	* armor.c (parse_header_line): Removed double empty line check.
+	(parse_header_line): Replaced trim_trailing_ws with a counting
+	function so that we can adjust for the next read.
+
+	* options.skel: Fixed 3 typos. By Thomas Klausner. Replaced the
+	keyserver example by a better working server. 
+
+	* parse-packet.c (parse_symkeyenc): Return Invalid_Packet on error.
+	(parse_pubkeyenc): Ditto.
+	(parse_onepass_sig): Ditto.
+	(parse_plaintext): Ditto.
+	(parse_encrypted): Ditto.
+	(parse_signature): Return error at other places too.
+	(parse_key): Ditto.
+	* g10.c (main): Set opt.list_packets to another value when invoked
+	with the --list-packets command.
+	* mainproc.c (do_proc_packets): Don's stop processing when running
+	under --list-packets command.
+
+	* signal.c (do_sigaction): Removed.
+	(init_one_signal): New to replace the above.  Needed to support
+	systems without sigactions. Suggested by Dave Dykstra.
+	(got_fatal_signal,init_signals): Use the above here. 
+	(do_block): Use sigset() if sigprocmask() is not available.
+
+	* armor.c (parse_hash_header): Test on TIGER192, which is the
+	correct value as per rfc2440.  By Edwin Woudt.
+
+2001-03-08  Werner Koch  <wk@gnupg.org>
+
+	* misc.c: Include time.h. By James Troup.
+
+	* getkey.c: Re-enabled the unknown user Id and PK caches and
+	increased their sizes.
+
+	* getkey.c (merge_selfsigs_main): Set expire date and continue
+	processing even if we found a revoked key.
+	(merge_selfsigs_subkeys): Ditto.
+	
+	* packet.h: Add an is_revoked flag to the user_id packet.
+	* getkey.c (fixup_uidnode): Set that flag here.
+	(merge_selfsigs_main): Fix so that the latest signature is used to
+	find the self-signature for an UID.
+	* parse-packet.c (parse_user_id): Zero out all fields.
+	* mainproc.c (check_sig_and_print): Print the primary user ID
+	according the the node flag and then all other non-revoked user IDs.
+	(is_uid_revoked): Removed; it is now handled by the key selection code.
+	
+	Changed the year list of all copyright notices.
+	
+2001-03-07  Werner Koch  <wk@gnupg.org>
+
+	* getkey.c (finish_lookup): Print an info message only in verbose mode.
+
+2001-03-05  Werner Koch  <wk@gnupg.org>
+
+	* packet.h: Replaced sigsubpkt_t value 101 by PRIV_VERIFY_CACHE.
+	We have never used the old value, so we can do this without any harm.
+	* parse-packet.c (dump_sig_subpkt): Ditto.
+	(parse_one_sig_subpkt): Parse that new sub packet.
+	* build-packet.c (build_sig_subpkt): Removed the old one from the
+	hashed area.
+	(delete_sig_subpkt): New.
+	(build_sig_subpkt): Allow an update of that new subpkt.
+	* sig-check.c (check_key_signature2): Add verification caching
+	(cache_selfsig_result): New.
+	* export.c (do_export_stream): Delete that sig subpkt before exporting.
+	* import.c (remove_bad_stuff): New.
+	(import): Apply that function to all imported data 
+
+2001-03-03  Werner Koch  <wk@gnupg.org>
+
+	* getkey.c: Introduced a new lookup context flag "exact" and used 
+	it in all place where we once used primary.
+	(classify_user_id2): Replaced the old function and add an extra
+	argument to return whether an exact keyID has been requested.
+	(key_byname): Removed the unused ctx.primary flag
+	(get_seckey_byname2): Ditto.
+	(finish_lookup): Changed debugging output.
+
+2001-03-02  Werner Koch  <wk@gnupg.org>
+
+	* keylist.c (list_one): Remove the merge key calls. 
+
+2001-03-01  Werner Koch  <wk@gnupg.org>
+
+	* getkey.c (finish_lookup): Don't use it if we no specific usage
+	has been requested.
+	(merge_selfsigs_main): fix UID only if we have an signature.
+	(lookup): Return UNU_PUBKEY etc. instead of NO_PUBKEY if we found
+	a key but the requested usage does not allow this key.
+	* import.c (import_one): Take UNU_PUBKEY into account.
+	* mainproc.c (list_node): Ditto.
+	* keylist.c (list_keyblock): Ditto.
+	* keyedit.c (print_and_check_one_sig): Ditto. 
+
+2001-02-09  Werner Koch  <wk@gnupg.org>
+
+	* delkey.c (delete_key): Removed that silly assert which rendered
+	the whole new stuff meaningless.
+
+2001-02-08  Werner Koch  <wk@gnupg.org>
+
+	* getkey.c (key_byname): I can happe that we have both, sk and pk
+	NULL, fix for that.
+
+	* parse-packet.c (parse_one_sig_subpkt): Add support for
+	primary_uid and key_flags.
+	(can_handle_critical): Ditto
+
+	* parse-packet.c (parse_encrypted): Fixed listing of pktlen for
+	MDC packets.
+
+	* getkey.c: Backported the version of this file from gpg 1.1. this
+	involved some changes in other files too.
+	* parse-packet.c (parse_key): Clear req_usage.
+	* skclist.c (build_sk_list): Use req_usage to pass the usage
+	information to the lookup function.
+	* pkclist.c (build_pk_list): Ditto.
+	* free-packet.c (copy_public_parts_to_secret_key): New.
+	* keydb.h: Add IS_* macros to check the sig_class.
+	* misc.c (openpgp_cipher_test_algo): New.
+	(openpgp_pk_test_algo): New.
+	(openpgp_pk_algo_usage): New.
+	(openpgp_md_test_algo): New.
+	* packet.h: Add a few fields to PKT_{public,secret}_key and
+	PKT_user_id.
+	* seckey-cert.c (do_check): Use the new main_keyid field.
+
+2001-02-04  Werner Koch  <wk@gnupg.org>
+
+	* encr-data.c (decrypt_data): Catch error when we had problems to
+	parse the encrypted packet. By Timo.
+
+2001-01-29  Werner Koch  <wk@gnupg.org>
+
+	* g10.c (main): --batch does now set nogreeting.
+
+	* delkey.c (do_delete_key): Fixed delete-both functionality.
+
+2001-01-22  Werner Koch  <wk@gnupg.org>
+
+	* g10.c: New command --delete-secret-and-public-key.
+	* delkey.c (delete_key): Add new arg allow_both.
+	(do_delete_key): Move most stuff from above to this new function.
+
+2001-01-12  Werner Koch  <wk@gnupg.org>
+
+	* passphrase.c (passphrase_to_dek): Use MD5 when IDEA is installed
+	and we have no S2K.
+	* mainproc.c (proc_encrypted): Likewise
+
+2001-01-11  Werner Koch  <wk@gnupg.org>
+
+	* sig-check.c (do_check): Print the signature key expire message
+	only in verbose mode and added the keyID.
+
+2001-01-09  Werner Koch  <wk@gnupg.org>
+
+	* status.c, status.h: New status USERID_HINT. 
+	(write_status_text): Replace LF and CR int text by C-escape sequence.
+
+	* passphrase.c (passphrase_to_dek): Fixed the NEED_PASSPHRASE
+	output.  It does now always print 2 keyIDs.  Emit the new
+	USERID_HINT.
+
+2001-01-08  Werner Koch  <wk@gnupg.org>
+
+	* g10.c, options.h: New option --no-expensive-trust-checks.
+	* keylist.c (list_keyblock): Act on this option.
+
+2001-01-04  Werner Koch  <wk@gnupg.org>
+
+	* g10.c (main): Set homedir only in the pre-parsing phase and
+	replace backslashes in the W32 version.
+
+2001-01-03  Werner Koch  <wk@gnupg.org>
+
+	* status.c, status.h : New status KEY_CREATED
+	* keygen.c (do_generate_keypair,generate_subkeypair): Emit it.
+
+2000-12-28  Werner Koch  <wk@gnupg.org>
+
+	* signal.c (got_fatal_signal): Remove lockfiles here because the
+	atexit stuff does not work due to the use of raise. Suggested by
+	Peter Fales.
+	* gpgv.c (remove_lockfiles): New stub.
+	
+2000-12-19  Werner Koch  <wk@gnupg.org>
+
+	* status.c, status.h (cpr_get_no_help): New.
+	* keyedit.c (keyedit_menu): Use it here because we have our own
+	help list here.
+
+2000-12-18  Werner Koch  <wk@gnupg.org>
+
+	* mainproc.c (print_failed_pkenc): Don't print the sometimes
+	confusing message about unavailabe secret key.  Renamed ...
+	(print_pkenc_list): ... to this and introduced failed arg.
+	(proc_encrypted): Print the failed encryption keys and then
+	the one to be used.
+	(proc_pubkey_enc): Store also the key we are going to use.
+
+	* mainproc.c (check_sig_and_print): Don't list revoked user IDs.
+	(is_uid_revoked): New.
+
+2000-12-08  Werner Koch  <wk@gnupg.org>
+
+	* pipemode.c: Made the command work.  Currently only for
+	non-armored detached signatures.
+	* mainproc.c (release_list): Reset the new pipemode vars.
+	(add_gpg_control): Handle the control packets for pipemode
+	* status.c, status.h: New stati {BEGIN,END}_STREAM.
+
+2000-12-07  Werner Koch  <wk@gnupg.org>
+
+	* g10.c: New option --allow-secret-key-import.
+	* import.c (import_keys,import_keys_stream): Honor this option.
+	(import): New arg allow_secret and pass that arg down to ...
+	(import_secret_one): to this and print a warning if secret key
+	importing is not allowed.
+
+2000-12-05  Werner Koch  <wk@gnupg.org>
+
+	* cipher.c (cipher_filter): Moved the end_encryption status ...
+	* encode.c (encode_simple,encode_crypt): to here
+	* sign.c (sign_file): and here.
+
+	* status.c (mywrite): Removed.
+	(get_status_string): Removed the LFs from the strings.
+	(set_status_fd,is_status_enabed,write_status_text,
+	write_status_buffer): Replaced all mywrite by stdio calls and use
+	fdopen to create a strem.  This is needed to make things smoother
+	in the W32 version.
+
+2000-12-04  Werner Koch  <wk@gnupg.org>
+
+	* import.c (merge_blocks): Increment n_sigs for revocations.
+
+2000-11-30  Werner Koch  <wk@gnupg.org>
+
+	* g10.c (main): Use iobuf_translate_file_handle for all options
+	with filehandles as arguments.  This is function does some magic
+	for the W32 API.
+
+	* verify.c (verify_signatures): Add a comment rant about the
+	detached signature problem.
+	* mainproc.c (proc_tree): Issue an error if a detached signature
+	is assumed but a standard one was found.
+	* plaintext.c (hash_datafiles): Don't fall back to read signature
+	from stdin.
+	* openfile.c (open_sigfile): Print verbose message only if the
+	file could be accessed.
+
+2000-11-24  Werner Koch  <wk@gnupg.org>
+
+	* passphrase.c [HAVE_DOSISH_SYSTEM]: Disabled all the agent stuff.
+
+2000-11-16  Werner Koch  <wk@gnupg.org>
+
+        * g10.c: New option --use-agent
+        * passphrase.c (agent_open,agent_close): New.
+        (agent_get_passphrase,agent_clear_passphrase): New.
+	(passphrase_clear_cache): New.
+        (passphrase_to_dek): Use the agent here.
+	* seckey-cert.c (do_check): Clear cached passphrases.
+
+2000-11-15  Werner Koch  <wk@gnupg.org>
+
+	* status.c (write_status_text): Moved the big switch to ...
+	(get_status_string): ... new function.
+	(write_status_buffer): New.
+
+	* status.c (mywrite): New and replaced all write() by this.
+
+	* status.c, status.h: Add 3 status lcodes for notaions and policy.
+	* mainproc.c (print_notation_data): Do status output of notations.
+	
+2000-11-13  Werner Koch  <wk@gnupg.org>
+
+	* sign.c (clearsign_file): Use LF macro to print linefeed.
+	
+2000-11-11  Paul Eggert  <eggert@twinsun.com>
+
+	Clean up the places in the code that incorrectly use "long" or
+        "unsigned long" for file offsets.  The correct type to use is
+        "off_t".  The difference is important on large-file hosts,
+        where "off_t" is longer than "long".
+
+        * keydb.h (struct keyblock_pos_struct.offset):
+        Use off_t, not ulong, for file offsets.
+        * packet.h (dbg_search_packet, dbg_copy_some_packets,
+        search_packet, copy_some_packets): Likewise.
+        * parse-packet.c (parse, dbg_search_packet, search_packet,
+        dbg_copy_some_packets, copy_some_packets): Likewise.
+        * ringedit.c (keyring_search): Likewise.
+
+        * parse-packet.c (parse): Do not use %lu to report file
+        offsets in error diagnostics; it's not portable.
+        * ringedit.c (keyring_search): Likewise.
+
+2000-11-09  Werner Koch  <wk@gnupg.org>
+
+	* g10.c (main): New option --enable-special-filenames.
+
+2000-11-07  Werner Koch  <wk@gnupg.org>
+ 
+	* g10.c (main): New command --pipemode.
+	* pipemode.c: New.
+
+2000-10-23  Werner Koch  <wk@gnupg.org>
+
+	* armor.c (armor_filter): Changed output of hdrlines, so that a CR
+	is emitted for DOS systems.
+
+	* keygen.c (read_parameter_file): Add a cast for isspace().
+
+	* status.c (myread): Use SIGINT instead of SIGHUP for DOS. 
+
+2000-10-19  Werner Koch  <wk@gnupg.org>
+
+	* g10.c: New option --ignore-crc-error
+	* armor.c (invalid_crc): New.
+	(radix64_read): Act on new option.
+
+	* openfile.c (try_make_homedir): Klaus Singvogel fixed a stupid
+	error introduced on Sep 6th. 
+
+2000-10-18  Werner Koch  <wk@gnupg.org>
+
+	* misc.c (print_cipher_algo_note): Don't print the note for AES.
+	Changed wording.
+
 2000-10-16  Werner Koch  <wk@gnupg.org>
 
 	* mainproc.c (do_proc_packets): Hack to fix the problem that
@@ -3042,4 +3588,16 @@
 Thu Feb 12 22:24:42 1998  Werner Koch  (wk@frodo)
 
 	* pubkey-enc.c (get_session_key): rewritten
+
+
+ Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
 
diff -urN gnupg-1.0.4/g10/Makefile.am gnupg-1.0.5/g10/Makefile.am
--- gnupg-1.0.4/g10/Makefile.am	Wed Oct  4 15:07:28 2000
+++ gnupg-1.0.5/g10/Makefile.am	Thu Mar  8 14:45:03 2001
@@ -1,3 +1,21 @@
+# Copyright (C) 1998, 1999, 2000, 2001 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
+
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
@@ -65,6 +83,7 @@
 	      tdbio.h		\
 	      delkey.c		\
 	      keygen.c          \
+	      pipemode.c        \
 	      helptext.c
 
 gpgv_SOURCES = gpgv.c           \
diff -urN gnupg-1.0.4/g10/Makefile.in gnupg-1.0.5/g10/Makefile.in
--- gnupg-1.0.4/g10/Makefile.in	Tue Oct 17 15:40:32 2000
+++ gnupg-1.0.5/g10/Makefile.in	Sun Apr 29 16:39:17 2001
@@ -10,6 +10,24 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+# Copyright (C) 1998, 1999, 2000, 2001 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
+
 
 SHELL = @SHELL@
 
@@ -72,6 +90,7 @@
 DATADIRNAME = @DATADIRNAME@
 DLLTOOL = @DLLTOOL@
 DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
+DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@
 DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@
 DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@
 DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@
@@ -118,7 +137,7 @@
 common_source =  	      build-packet.c		      compress.c		      filter.h			      free-packet.c		      getkey.c			      ringedit.c		      seskey.c			      keydb.h			      kbnode.c			      main.h			      mainproc.c		      armor.c			      mdfilter.c		      textfilter.c		      misc.c			      options.h 		      openfile.c		      keyid.c			      packet.h			      parse-packet.c		      comment.c 		      status.c			      status.h			      plaintext.c		      sig-check.c		      signal.c		
 
 
-gpg_SOURCES = g10.c			      $(common_source)		      pkclist.c 		      skclist.c 		      pubkey-enc.c		      passphrase.c		      seckey-cert.c		      encr-data.c		      cipher.c			      keylist.c 		      encode.c			      sign.c			      verify.c			      revoke.c			      decrypt.c 		      keyedit.c 		      dearmor.c 		      import.c			      export.c			      hkp.h			      hkp.c			      trustdb.c 		      trustdb.h 		      tdbdump.c 		      tdbio.c			      tdbio.h			      delkey.c			      keygen.c          	      helptext.c
+gpg_SOURCES = g10.c			      $(common_source)		      pkclist.c 		      skclist.c 		      pubkey-enc.c		      passphrase.c		      seckey-cert.c		      encr-data.c		      cipher.c			      keylist.c 		      encode.c			      sign.c			      verify.c			      revoke.c			      decrypt.c 		      keyedit.c 		      dearmor.c 		      import.c			      export.c			      hkp.h			      hkp.c			      trustdb.c 		      trustdb.h 		      tdbdump.c 		      tdbio.c			      tdbio.h			      delkey.c			      keygen.c          	      pipemode.c        	      helptext.c
 
 
 gpgv_SOURCES = gpgv.c           	      $(common_source)  	      verify.c          
@@ -147,7 +166,7 @@
 sig-check.o signal.o pkclist.o skclist.o pubkey-enc.o passphrase.o \
 seckey-cert.o encr-data.o cipher.o keylist.o encode.o sign.o verify.o \
 revoke.o decrypt.o keyedit.o dearmor.o import.o export.o hkp.o \
-trustdb.o tdbdump.o tdbio.o delkey.o keygen.o helptext.o
+trustdb.o tdbdump.o tdbio.o delkey.o keygen.o pipemode.o helptext.o
 gpg_LDADD = $(LDADD)
 gpg_DEPENDENCIES =  ../cipher/libcipher.a ../mpi/libmpi.a \
 ../util/libutil.a
@@ -291,6 +310,11 @@
 	../include/memory.h ../include/cipher.h \
 	../include/../cipher/random.h filter.h ../include/errors.h \
 	../include/util.h options.h
+caching.o: caching.c ../config.h ../g10defs.h options.h \
+	../include/types.h packet.h ../include/iobuf.h ../include/mpi.h \
+	../include/memory.h ../include/cipher.h \
+	../include/../cipher/random.h filter.h ../include/errors.h \
+	keydb.h ../include/util.h main.h ../include/i18n.h
 cipher.o: cipher.c ../config.h ../g10defs.h ../include/errors.h \
 	../include/iobuf.h ../include/types.h ../include/memory.h \
 	../include/util.h ../include/mpi.h filter.h ../include/cipher.h \
@@ -325,7 +349,8 @@
 	packet.h ../include/iobuf.h ../include/mpi.h \
 	../include/memory.h ../include/cipher.h \
 	../include/../cipher/random.h filter.h ../include/errors.h \
-	keydb.h ../include/util.h main.h trustdb.h ../include/i18n.h
+	keydb.h ../include/util.h main.h trustdb.h ../include/i18n.h \
+	status.h
 encr-data.o: encr-data.c ../config.h ../g10defs.h ../include/util.h \
 	../include/types.h ../include/errors.h ../include/mpi.h \
 	../include/iobuf.h ../include/memory.h packet.h \
@@ -432,6 +457,11 @@
 	../include/ttyio.h ../include/cipher.h \
 	../include/../cipher/random.h keydb.h packet.h filter.h main.h \
 	../include/i18n.h status.h
+pipemode.o: pipemode.c ../config.h ../g10defs.h options.h \
+	../include/types.h packet.h ../include/iobuf.h ../include/mpi.h \
+	../include/memory.h ../include/cipher.h \
+	../include/../cipher/random.h filter.h ../include/errors.h \
+	keydb.h ../include/util.h main.h status.h
 pkclist.o: pkclist.c ../config.h ../g10defs.h options.h \
 	../include/types.h packet.h ../include/iobuf.h ../include/mpi.h \
 	../include/memory.h ../include/cipher.h \
diff -urN gnupg-1.0.4/g10/armor.c gnupg-1.0.5/g10/armor.c
--- gnupg-1.0.4/g10/armor.c	Fri Oct 13 16:50:00 2000
+++ gnupg-1.0.5/g10/armor.c	Thu Apr  5 09:50:52 2001
@@ -1,5 +1,5 @@
 /* armor.c - Armor flter
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -151,8 +151,9 @@
 }
 
 /****************
- * Check whether this is an armored file or not
- * See also parse-packet.c for details on this code
+ * Check whether this is an armored file or not See also
+ * parse-packet.c for details on this code For unknown historic
+ * reasons we use a string here but only the first byte will be used.
  * Returns: True if it seems to be armored
  */
 static int
@@ -195,6 +196,7 @@
     byte buf[1];
     int n;
 
+    /* fixme: there might be a problem with iobuf_peek */
     n = iobuf_peek(a, buf, 1 );
     if( n == -1 )
 	return 0; /* EOF, doesn't matter whether armored or not */
@@ -245,7 +247,9 @@
 	    found |= 2;
 	else if( !strncmp( s, "MD5", s2-s ) )
 	    found |= 4;
-	else if( !strncmp( s, "TIGER", s2-s ) )
+	else if( !strncmp( s, "TIGER192", s2-s ) )
+	    found |= 8;
+	else if( !strncmp( s, "TIGER", s2-s ) ) /* used by old versions */
 	    found |= 8;
 	else
 	    return 0;
@@ -312,19 +316,19 @@
  *	 >0: Good header line
  */
 static int
-parse_header_line( armor_filter_context_t *afx, byte *line, unsigned len )
+parse_header_line( armor_filter_context_t *afx, byte *line, unsigned int len )
 {
     byte *p;
     int hashes=0;
+    unsigned int len2;
 
-    /* fixme: why this double check?  I think the original code w/o the
-     * second check for an empty line was done from an early draft of
-     * of OpenPGP - or simply very stupid code */
-    if( *line == '\n' || ( len && (*line == '\r' && line[1]=='\n') ) )
-	return 0; /* empty line */
-    len = trim_trailing_ws( line, len );
-    if( !len )
-	return 0; /* WS only same as empty line */
+    len2 = check_trailing_ws( line, len );
+    if( !len2 ) {
+        afx->buffer_pos = len2;  /* (it is not the fine way to do it here) */
+	return 0; /* WS only: same as empty line */
+    }
+    len = len2;
+    line[len2] = 0;
 
     p = strchr( line, ':');
     if( !p || !p[1] ) {
@@ -590,6 +594,15 @@
 }
 
 
+static int
+invalid_crc(void)
+{
+    if ( opt.ignore_crc_error )
+        return 0;
+    log_inc_errorcount();
+    return G10ERR_INVALID_ARMOR;
+}
+
 
 static int
 radix64_read( armor_filter_context_t *afx, IOBUF a, size_t *retn,
@@ -728,20 +741,23 @@
 		    break; /* eof */
 	    } while( ++idx < 4 );
 	    if( c == -1 ) {
-		log_error(_("premature eof (in CRC)\n"));
-		rc = G10ERR_INVALID_ARMOR;
-	    }
+		log_info(_("premature eof (in CRC)\n"));
+		rc = invalid_crc();
+                	    }
 	    else if( idx != 4 ) {
-		log_error(_("malformed CRC\n"));
-		rc = G10ERR_INVALID_ARMOR;
+		log_info(_("malformed CRC\n"));
+		rc = invalid_crc();
 	    }
 	    else if( mycrc != afx->crc ) {
-		log_error(_("CRC error; %06lx - %06lx\n"),
+                log_info (_("CRC error; %06lx - %06lx\n"),
 				    (ulong)afx->crc, (ulong)mycrc);
-		rc = G10ERR_INVALID_ARMOR;
+                rc = invalid_crc();
 	    }
 	    else {
 		rc = 0;
+                /* FIXME: Here we should emit another control packet,
+                 * so that we know in mainproc that we are processing
+                 * a clearsign message */
 	      #if 0
 		for(rc=0;!rc;) {
 		    rc = 0 /*check_trailer( &fhdr, c )*/;
@@ -855,7 +871,7 @@
                 buf[n++] = 0xff; /* new format, type 63, 1 length byte */
                 n++;   /* see below */
                 memcpy(buf+n, sesmark, sesmarklen ); n+= sesmarklen;
-                buf[n++] = 1;    /* control type */
+                buf[n++] = CTRLPKT_CLEARSIGN_START; 
                 buf[n++] = afx->not_dash_escaped? 0:1; /* sigclass */
                 if( hashes & 1 ) 
                     buf[n++] = DIGEST_ALGO_RMD160;
@@ -919,8 +935,15 @@
 		iobuf_writestr(a, LF );
 	    }
 
-	    if( afx->hdrlines )
-		iobuf_writestr(a, afx->hdrlines);
+	    if ( afx->hdrlines ) {
+                for ( s = afx->hdrlines; *s; s++ ) {
+                  #ifdef HAVE_DOSISH_SYSTEM
+                    if ( *s == '\n' )
+                        iobuf_put( a, '\r');
+                  #endif
+                    iobuf_put(a, *s );
+                }
+            }
 	    iobuf_writestr(a, LF );
 	    afx->status++;
 	    afx->idx = 0;
@@ -1071,4 +1094,222 @@
     *p = 0;
     return buffer;
 }
+
+
+/***********************************************
+ *  For the pipemode command we can't use the armor filter for various
+ *  reasons, so we use this new unarmor_pump stuff to remove the armor 
+ */
+
+enum unarmor_state_e {
+    STA_init = 0,
+    STA_bypass,
+    STA_wait_newline,
+    STA_wait_dash,
+    STA_first_dash, 
+    STA_compare_header,
+    STA_found_header_wait_newline,
+    STA_skip_header_lines,
+    STA_skip_header_lines_non_ws,
+    STA_read_data,
+    STA_wait_crc,
+    STA_read_crc,
+    STA_ready
+};
+
+struct unarmor_pump_s {
+    enum unarmor_state_e state;
+    byte val;
+    int checkcrc;
+    int pos;   /* counts from 0..3 */
+    u32 crc;
+    u32 mycrc; /* the one store in the data */
+};
+
+
+
+UnarmorPump
+unarmor_pump_new (void)
+{
+    UnarmorPump x;
+
+    if( !is_initialized )
+        initialize();
+    x = m_alloc_clear (sizeof *x);
+    return x;
+}
+
+void
+unarmor_pump_release (UnarmorPump x)
+{
+    m_free (x);
+}
+
+/* 
+ * Get the next character from the ascii armor taken from the IOBUF
+ * created earlier by unarmor_pump_new().
+ * Return:  c = Character
+ *        256 = ignore this value
+ *         -1 = End of current armor 
+ *         -2 = Premature EOF (not used)
+ *         -3 = Invalid armor
+ */
+int
+unarmor_pump (UnarmorPump x, int c)
+{
+    int rval = 256; /* default is to ignore the return value */
+
+    switch (x->state) {
+      case STA_init:
+        { 
+            byte tmp[1];
+            tmp[0] = c; 
+            if ( is_armored (tmp) )
+                x->state = c == '-'? STA_first_dash : STA_wait_newline;
+            else {
+                x->state = STA_bypass;
+                return c;
+            }
+        }
+        break;
+      case STA_bypass:
+        return c; /* return here to avoid crc calculation */
+      case STA_wait_newline:
+        if (c == '\n')
+            x->state = STA_wait_dash;
+        break;
+      case STA_wait_dash:
+        x->state = c == '-'? STA_first_dash : STA_wait_newline;
+        break;
+      case STA_first_dash: /* just need for initalization */
+        x->pos = 0;
+        x->state = STA_compare_header;
+      case STA_compare_header:
+        if ( "-----BEGIN PGP SIGNATURE-----"[++x->pos] == c ) {
+            if ( x->pos == 28 ) 
+                x->state = STA_found_header_wait_newline;
+        }
+        else 
+            x->state = c == '\n'? STA_wait_dash : STA_wait_newline;
+        break;
+      case STA_found_header_wait_newline:
+        /* to make CR,LF issues easier we simply allow for white space
+           behind the 5 dashes */
+        if ( c == '\n' )
+            x->state = STA_skip_header_lines;
+        else if ( c != '\r' && c != ' ' && c != '\t' )
+            x->state = STA_wait_dash; /* garbage after the header line */
+        break;
+      case STA_skip_header_lines:
+        /* i.e. wait for one empty line */
+        if ( c == '\n' ) {
+            x->state = STA_read_data;
+            x->crc = CRCINIT;
+            x->val = 0;
+            x->pos = 0;
+        }
+        else if ( c != '\r' && c != ' ' && c != '\t' )
+            x->state = STA_skip_header_lines_non_ws;
+        break;
+      case STA_skip_header_lines_non_ws:
+        /* like above but we already encountered non white space */
+        if ( c == '\n' )
+            x->state = STA_skip_header_lines;
+        break;
+      case STA_read_data:
+        /* fixme: we don't check for the trailing dash lines but rely
+         * on the armor stop characters */
+        if( c == '\n' || c == ' ' || c == '\r' || c == '\t' )
+            break; /* skip all kind of white space */
+
+        if( c == '=' ) { /* pad character: stop */
+            if( x->pos == 1 ) /* in this case val has some value */
+                rval = x->val;
+            x->state = STA_wait_crc;
+            break;
+        }
+
+        {
+            int c2;
+            if( (c = asctobin[(c2=c)]) == 255 ) {
+                log_error(_("invalid radix64 character %02x skipped\n"), c2);
+                break;
+            }
+        }
+        
+        switch(x->pos) {
+          case 0:
+            x->val = c << 2;
+            break;
+          case 1:
+            x->val |= (c>>4)&3;
+            rval = x->val;
+            x->val = (c<<4)&0xf0;
+            break;
+          case 2:
+            x->val |= (c>>2)&15;
+            rval = x->val;
+            x->val = (c<<6)&0xc0;
+            break;
+          case 3:
+            x->val |= c&0x3f;
+            rval = x->val;
+            break;
+        }
+        x->pos = (x->pos+1) % 4;
+        break;
+      case STA_wait_crc:
+        if( c == '\n' || c == ' ' || c == '\r' || c == '\t' || c == '=' )
+            break; /* skip ws and pad characters */
+        /* assume that we are at the next line */
+        x->state = STA_read_crc;
+        x->pos = 0;
+        x->mycrc = 0;
+      case STA_read_crc:
+        if( (c = asctobin[c]) == 255 ) {
+            rval = -1; /* ready */
+            if( x->crc != x->mycrc ) {
+                log_info (_("CRC error; %06lx - %06lx\n"),
+                          (ulong)x->crc, (ulong)x->mycrc);
+                if ( invalid_crc() )
+                    rval = -3;
+            }
+            x->state = STA_ready; /* not sure whether this is correct */
+            break;
+        }
+        
+        switch(x->pos) {
+          case 0:
+            x->val = c << 2;
+            break;
+          case 1:
+            x->val |= (c>>4)&3;
+            x->mycrc |= x->val << 16;
+            x->val = (c<<4)&0xf0;
+            break;
+          case 2:
+            x->val |= (c>>2)&15;
+            x->mycrc |= x->val << 8;
+            x->val = (c<<6)&0xc0;
+            break;
+          case 3:
+            x->val |= c&0x3f;
+            x->mycrc |= x->val;
+            break;
+        }
+        x->pos = (x->pos+1) % 4;
+        break;
+      case STA_ready:
+        rval = -1;
+        break;
+    }
+
+    if ( !(rval & ~255) ) { /* compute the CRC */
+        x->crc = (x->crc << 8) ^ crc_table[((x->crc >> 16)&0xff) ^ rval];
+        x->crc &= 0x00ffffff;
+    }
+
+    return rval;
+}
+
 
diff -urN gnupg-1.0.4/g10/build-packet.c gnupg-1.0.5/g10/build-packet.c
--- gnupg-1.0.4/g10/build-packet.c	Wed May 31 21:38:39 2000
+++ gnupg-1.0.5/g10/build-packet.c	Tue Apr 24 11:44:17 2001
@@ -1,5 +1,5 @@
 /* build-packet.c - assemble packets and write them
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -353,7 +353,7 @@
 	    ndays = (u16)((sk->expiredate - sk->timestamp) / 86400L);
 	else
 	    ndays = 0;
-	write_16(a, 0 );
+	write_16(a, ndays);
     }
     iobuf_put(a, sk->pubkey_algo );
     nskey = pubkey_get_nskey( sk->pubkey_algo );
@@ -535,7 +535,7 @@
     int rc = 0;
     u32 n;
 
-    n = ed->len ? (ed->len + 10) : 0;
+    n = ed->len ? (ed->len + ed->extralen) : 0;
     write_header(out, ctb, n );
 
     /* This is all. The caller has to write the real data */
@@ -551,7 +551,7 @@
 
     assert( ed->mdc_method );
 
-    n = ed->len ? (ed->len + 10) : 0;
+    n = ed->len ? (ed->len + ed->extralen) : 0;
     write_header(out, ctb, n );
     iobuf_put(out, 1 );  /* version */
 
@@ -648,13 +648,83 @@
     return NULL;
 }
 
+/****************
+ * Delete all subpackets of type REQTYPE and return the number of bytes
+ * which are now unused at the end of the buffer.
+ */
+size_t
+delete_sig_subpkt( byte *buffer, sigsubpkttype_t reqtype )
+{
+    int buflen, orig_buflen;
+    sigsubpkttype_t type;
+    byte *bufstart, *orig_buffer;
+    size_t n;
+    size_t unused = 0;
+    int okay = 0;
+
+    if( !buffer )
+	return 0;
+    orig_buffer = buffer;
+    buflen = (*buffer << 8) | buffer[1];
+    buffer += 2;
+    orig_buflen = buflen;
+    for(;;) {
+	if( !buflen ) {
+            okay = 1;
+            break;
+        }
+	bufstart = buffer;
+	n = *buffer++; buflen--;
+	if( n == 255 ) {
+	    if( buflen < 4 )
+		break;
+	    n = (buffer[0] << 24) | (buffer[1] << 16)
+				  | (buffer[2] << 8) | buffer[3];
+	    buffer += 4;
+	    buflen -= 4;
+	}
+	else if( n >= 192 ) {
+	    if( buflen < 2 )
+		break;
+	    n = (( n - 192 ) << 8) + *buffer + 192;
+	    buffer++;
+	    buflen--;
+	}
+	if( buflen < n )
+	    break;
+	type = *buffer & 0x7f;
+	if( type == reqtype ) {
+	    buffer++;
+            buflen--;
+	    n--;
+	    if( n > buflen )
+		break;
+            memmove (bufstart, buffer + n, n + (buffer-bufstart)); /* shift */
+            unused += n + (buffer-bufstart);
+            buffer = bufstart;
+            buflen -= n;
+	}
+        else {
+            buffer += n; buflen -=n;
+        }
+    }
+
+    if (!okay)
+        log_error("delete_subpkt: buffer shorter than subpacket\n");
+    assert (unused <= orig_buflen);
+    orig_buflen -= unused;
+    orig_buffer[0] = (orig_buflen >> 8) & 0xff;
+    orig_buffer[1] = orig_buflen & 0xff;
+    return unused;
+}
+
 
 /****************
  * Create or update a signature subpacket for SIG of TYPE.
  * This functions knows where to put the data (hashed or unhashed).
- * The function may move data from the unhased part to the hashed one.
+ * The function may move data from the unhashed part to the hashed one.
  * Note: All pointers into sig->[un]hashed are not valid after a call
- * to this function.  The data to but into the subpaket should be
+ * to this function.  The data to put into the subpaket should be
  * in buffer with a length of buflen.
  */
 void
@@ -666,6 +736,7 @@
     int found=0;
     int critical, hashed, realloced;
     size_t n, n0;
+    size_t unused = 0;
 
     critical = (type & SIGSUBPKT_FLAG_CRITICAL);
     type &= ~SIGSUBPKT_FLAG_CRITICAL;
@@ -677,6 +748,12 @@
     else if( (data = find_subpkt( sig->unhashed_data, type, &hlen, &dlen )))
 	found = 2;
 
+    if (found==2 && type == SIGSUBPKT_PRIV_VERIFY_CACHE) {
+        unused = delete_sig_subpkt (sig->unhashed_data, type);
+        assert (unused);
+        found = 0;
+    }
+
     if( found )
 	log_bug("build_sig_packet: update nyi\n");
     if( (buflen+1) >= 8384 )
@@ -688,7 +765,6 @@
 
     switch( type ) {
       case SIGSUBPKT_SIG_CREATED:
-      case SIGSUBPKT_PRIV_ADD_SIG:
       case SIGSUBPKT_PREF_SYM:
       case SIGSUBPKT_PREF_HASH:
       case SIGSUBPKT_PREF_COMPR:
@@ -713,9 +789,17 @@
 	n0 = sig->unhashed_data ? ((*sig->unhashed_data << 8)
 				      | sig->unhashed_data[1]) : 0;
 	n = n0 + nlen + 1 + buflen; /* length, type, buffer */
-	realloced = !!sig->unhashed_data;
-	data = sig->unhashed_data ? m_realloc( sig->unhashed_data, n+2 )
-				  : m_alloc( n+2 );
+        if ( sig->unhashed_data && (nlen + 1 + buflen) <= unused ) {
+            /* does fit into the freed area */
+            data = sig->unhashed_data;
+            realloced = 1;
+            log_debug ("updating area of type %d\n", type );
+        }
+        else {
+            realloced = !!sig->unhashed_data;
+            data = sig->unhashed_data ? m_realloc( sig->unhashed_data, n+2 )
+                                      : m_alloc( n+2 );
+        }
     }
 
     if( critical )
@@ -734,7 +818,7 @@
     }
     else if( nlen == 2 ) {
 	data[n0+2] = (buflen+1-192) / 256 + 192;
-	data[n0+3] = (buflen+1-192) & 256;
+	data[n0+3] = (buflen+1-192) % 256;
 	data[n0+4] = type;
 	memcpy(data+n0+5, buffer, buflen );
     }
diff -urN gnupg-1.0.4/g10/cipher.c gnupg-1.0.5/g10/cipher.c
--- gnupg-1.0.4/g10/cipher.c	Tue Jun 27 10:40:20 2000
+++ gnupg-1.0.5/g10/cipher.c	Mon Apr  2 09:02:48 2001
@@ -1,5 +1,5 @@
 /* cipher.c - En-/De-ciphering filter
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -59,6 +59,7 @@
 
     memset( &ed, 0, sizeof ed );
     ed.len = cfx->datalen;
+    ed.extralen = blocksize+2;
     ed.new_ctb = !ed.len && !opt.rfc1991;
     if( use_mdc ) {
 	ed.mdc_method = DIGEST_ALGO_SHA1;
@@ -141,7 +142,6 @@
 		log_error("writing MDC packet failed\n" );
 	}
 	cipher_close(cfx->cipher_hd);
-	write_status( STATUS_END_ENCRYPTION );
     }
     else if( control == IOBUFCTRL_DESC ) {
 	*(char**)buf = "cipher_filter";
diff -urN gnupg-1.0.4/g10/compress.c gnupg-1.0.5/g10/compress.c
--- gnupg-1.0.4/g10/compress.c	Tue May  9 08:56:45 2000
+++ gnupg-1.0.5/g10/compress.c	Thu Mar  8 14:59:57 2001
@@ -1,5 +1,5 @@
 /* compress.c - compress filter
- *	Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/g10/dearmor.c gnupg-1.0.5/g10/dearmor.c
--- gnupg-1.0.4/g10/dearmor.c	Tue May  9 08:57:56 2000
+++ gnupg-1.0.5/g10/dearmor.c	Thu Mar  8 15:00:07 2001
@@ -1,5 +1,5 @@
 /* dearmor.c - Armor utility
- *	Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/g10/decrypt.c gnupg-1.0.5/g10/decrypt.c
--- gnupg-1.0.4/g10/decrypt.c	Mon Apr 26 17:52:54 1999
+++ gnupg-1.0.5/g10/decrypt.c	Thu Mar  8 15:00:26 2001
@@ -1,5 +1,5 @@
 /* decrypt.c - verify signed data
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/g10/delkey.c gnupg-1.0.5/g10/delkey.c
--- gnupg-1.0.4/g10/delkey.c	Fri May 12 11:36:30 2000
+++ gnupg-1.0.5/g10/delkey.c	Thu Mar  8 15:00:37 2001
@@ -1,5 +1,5 @@
 /* delkey.c - delete keys
- *	Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -43,9 +43,11 @@
 
 /****************
  * Delete a public or secret key from a keyring.
+ * r_sec_avail will be set if a secret key is available and the public
+ * key can't be deleted for that reason.
  */
-int
-delete_key( const char *username, int secret )
+static int
+do_delete_key( const char *username, int secret, int *r_sec_avail )
 {
     int rc = 0;
     KBNODE keyblock = NULL;
@@ -57,6 +59,7 @@
     int okay=0;
     int yes;
 
+    *r_sec_avail = 0;
     /* search the userid */
     rc = secret? find_secret_keyblock_byname( &kbpos, username )
 	       : find_keyblock_byname( &kbpos, username );
@@ -90,12 +93,9 @@
 	keyid_from_pk( pk, keyid );
 	rc = seckey_available( keyid );
 	if( !rc ) {
-	    log_error(_(
-	    "there is a secret key for this public key!\n"));
-	    log_info(_(
-	    "use option \"--delete-secret-key\" to delete it first.\n"));
-	    write_status_text( STATUS_DELETE_PROBLEM, "2" );
-	    rc = -1;
+            *r_sec_avail = 1;
+            rc = -1;
+            goto leave;
 	}
 	else if( rc != G10ERR_NO_SECKEY ) {
 	    log_error("%s: get secret key: %s\n", username, g10_errstr(rc) );
@@ -161,3 +161,28 @@
     return rc;
 }
 
+/****************
+ * Delete a public or secret key from a keyring.
+ */
+int
+delete_key( const char *username, int secret, int allow_both )
+{
+    int rc, avail;
+
+    rc = do_delete_key (username, secret, &avail );
+    if ( rc && avail ) { 
+        if ( allow_both ) {
+            rc = do_delete_key (username, 1, &avail );
+            if ( !rc )
+                rc = do_delete_key (username, 0, &avail );
+        }
+        else {
+            log_error(_(
+                "there is a secret key for this public key!\n"));
+            log_info(_(
+                "use option \"--delete-secret-key\" to delete it first.\n"));
+            write_status_text( STATUS_DELETE_PROBLEM, "2" );
+        }
+    }
+    return rc;
+}
diff -urN gnupg-1.0.4/g10/encode.c gnupg-1.0.5/g10/encode.c
--- gnupg-1.0.4/g10/encode.c	Wed Sep  6 17:21:35 2000
+++ gnupg-1.0.5/g10/encode.c	Thu Mar  8 15:01:07 2001
@@ -1,5 +1,5 @@
 /* encode.c - encode data
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -36,7 +36,7 @@
 #include "filter.h"
 #include "trustdb.h"
 #include "i18n.h"
-
+#include "status.h"
 
 static int encode_simple( const char *filename, int mode );
 static int write_pubkey_enc_from_list( PK_LIST pk_list, DEK *dek, IOBUF out );
@@ -221,8 +221,11 @@
     iobuf_close(inp);
     if (rc)
 	iobuf_cancel(out);
-    else
+    else {
 	iobuf_close(out); /* fixme: check returncode */
+        if (mode)
+            write_status( STATUS_END_ENCRYPTION );
+    }
     if (pt)
 	pt->buf = NULL;
     free_packet(&pkt);
@@ -323,7 +326,7 @@
 	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 */
+         * so we switch to partial length encoding in this case */
         if ( filesize >= IOBUF_FILELENGTH_LIMIT )
             filesize = 0;
     }
@@ -381,8 +384,10 @@
     iobuf_close(inp);
     if( rc )
 	iobuf_cancel(out);
-    else
+    else {
 	iobuf_close(out); /* fixme: check returncode */
+        write_status( STATUS_END_ENCRYPTION );
+    }
     if( pt )
 	pt->buf = NULL;
     free_packet(&pkt);
diff -urN gnupg-1.0.4/g10/encr-data.c gnupg-1.0.5/g10/encr-data.c
--- gnupg-1.0.4/g10/encr-data.c	Tue Jun 27 10:39:21 2000
+++ gnupg-1.0.5/g10/encr-data.c	Thu Mar  8 15:01:16 2001
@@ -1,5 +1,5 @@
 /* encr-data.c -  process an encrypted data packet
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -92,6 +92,10 @@
     else if( rc ) {
 	log_error("key setup failed: %s\n", g10_errstr(rc) );
 	goto leave;
+    }
+    if (!ed->buf) {
+        log_error(_("problem handling encrypted packet\n"));
+        goto leave;
     }
 
     cipher_setiv( dfx.cipher_hd, NULL, 0 );
diff -urN gnupg-1.0.4/g10/export.c gnupg-1.0.5/g10/export.c
--- gnupg-1.0.4/g10/export.c	Tue May  9 08:59:05 2000
+++ gnupg-1.0.5/g10/export.c	Tue Apr 17 09:50:36 2001
@@ -1,5 +1,5 @@
 /* export.c
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -197,6 +197,10 @@
 				       SIGSUBPKT_EXPORTABLE, NULL );
 		if( p && !*p )
 		    continue; /* not exportable */
+
+                /* delete our verification cache */
+                delete_sig_subpkt (node->pkt->pkt.signature->unhashed_data,
+                   SIGSUBPKT_PRIV_VERIFY_CACHE);
 	    }
 
 	    if( secret == 2 && node->pkt->pkttype == PKT_SECRET_KEY ) {
diff -urN gnupg-1.0.4/g10/filter.h gnupg-1.0.5/g10/filter.h
--- gnupg-1.0.4/g10/filter.h	Wed May 31 08:56:18 2000
+++ gnupg-1.0.5/g10/filter.h	Wed Apr  4 13:59:19 2001
@@ -1,5 +1,5 @@
 /* filter.h
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -64,6 +64,9 @@
     int pending_lf;	    /* used together with faked */
 } armor_filter_context_t;
 
+struct unarmor_pump_s;
+typedef struct unarmor_pump_s *UnarmorPump;
+
 
 typedef struct {
     int status;
@@ -113,6 +116,9 @@
 int use_armor_filter( IOBUF a );
 int armor_filter( void *opaque, int control,
 		  IOBUF chain, byte *buf, size_t *ret_len);
+UnarmorPump unarmor_pump_new (void);
+void        unarmor_pump_release (UnarmorPump x);
+int         unarmor_pump (UnarmorPump x, int c);
 
 /*-- compress.c --*/
 int compress_filter( void *opaque, int control,
diff -urN gnupg-1.0.4/g10/free-packet.c gnupg-1.0.5/g10/free-packet.c
--- gnupg-1.0.4/g10/free-packet.c	Tue May  9 08:59:13 2000
+++ gnupg-1.0.5/g10/free-packet.c	Thu Mar  8 15:02:01 2001
@@ -1,5 +1,5 @@
 /* free-packet.c - cleanup stuff for packets
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -138,6 +138,29 @@
 copy_public_key( PKT_public_key *d, PKT_public_key *s )
 {
    return copy_public_key_new_namehash( d, s, NULL );
+}
+
+/****************
+ * Replace all common parts of a sk by the one from the public key.
+ * This is a hack and a better solution will be to just store the real secret
+ * parts somewhere and don't duplicate all the other stuff.
+ */
+void
+copy_public_parts_to_secret_key( PKT_public_key *pk, PKT_secret_key *sk )
+{
+    sk->expiredate  = pk->expiredate;     
+    sk->pubkey_algo = pk->pubkey_algo;    
+    sk->pubkey_usage= pk->pubkey_usage;
+    sk->created     = pk->created;        
+    sk->req_usage   = pk->req_usage;
+    sk->req_algo    = pk->req_algo;
+    sk->has_expired = pk->has_expired;    
+    sk->is_revoked  = pk->is_revoked;     
+    sk->is_valid    = pk->is_valid;    
+    sk->main_keyid[0]= pk->main_keyid[0];
+    sk->main_keyid[1]= pk->main_keyid[1];
+    sk->keyid[0]    = pk->keyid[0];
+    sk->keyid[1]    = pk->keyid[1];
 }
 
 PKT_signature *
diff -urN gnupg-1.0.4/g10/g10.c gnupg-1.0.5/g10/g10.c
--- gnupg-1.0.4/g10/g10.c	Mon Oct 16 10:01:07 2000
+++ gnupg-1.0.5/g10/g10.c	Tue Mar 27 16:53:39 2001
@@ -1,5 +1,5 @@
 /* g10.c - The GnuPG utility (main for gpg)
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -47,7 +47,6 @@
 #include "g10defs.h"
 #include "hkp.h"
 
-
 enum cmd_and_opt_values { aNull = 0,
     oArmor	  = 'a',
     aDetachedSign = 'b',
@@ -77,6 +76,7 @@
     aEditKey,
     aDeleteKey,
     aDeleteSecretKey,
+    aDeleteSecretAndPublicKey,
     aKMode,
     aKModeC,
     aImport,
@@ -107,6 +107,8 @@
     aDeArmor,
     aEnArmor,
     aGenRandom,
+    aPipeMode,
+    aRefreshCaches,
 
     oTextmode,
     oFingerprint,
@@ -183,19 +185,27 @@
     oDisablePubkeyAlgo,
     oAllowNonSelfsignedUID,
     oAllowFreeformUID,
+    oAllowSecretKeyImport,                      
+    oEnableSpecialFilenames,
     oNoLiteral,
     oSetFilesize,
     oHonorHttpProxy,
     oFastListMode,
     oListOnly,
     oIgnoreTimeConflict,
+    oIgnoreCrcError,                          
     oShowSessionKey,
     oOverrideSessionKey,
     oNoRandomSeedFile,
     oNoAutoKeyRetrieve,
+    oUseAgent,
     oMergeOnly,
     oTryAllSecrets,
     oTrustedKey,
+    oNoExpensiveTrustChecks,
+    oFixedListMode,
+    oNoSigCache,
+    oNoSigCreateCheck,
     oEmu3DESS2KBug,  /* will be removed in 1.1 */
     oEmuMDEncodeBug,
 aTest };
@@ -279,6 +289,7 @@
     { oForceMDC, "force-mdc", 0, N_("always use a MDC for encryption") },
     { oDryRun, "dry-run",   0, N_("do not make any changes") },
   /*{ oInteractive, "interactive", 0, N_("prompt before overwriting") }, */
+    { oUseAgent, "use-agent",0, N_("use the gpg-agent")},
     { oBatch, "batch",     0, N_("batch mode: never ask")},
     { oAnswerYes, "yes",       0, N_("assume yes on most questions")},
     { oAnswerNo,  "no",        0, N_("assume no on most questions")},
@@ -327,6 +338,7 @@
     { aPrintMDs, "print-mds" , 256, "@"}, /* old */
     { aListTrustDB, "list-trustdb",0 , "@"},
     { aListTrustPath, "list-trust-path",0, "@"},
+    { aPipeMode,  "pipemode", 0, "@" },
     { oKOption, NULL,	 0, "@"},
     { oPasswdFD, "passphrase-fd",1, "@" },
     { oCommandFD, "command-fd",1, "@" },
@@ -376,14 +388,22 @@
     { oSetFilesize, "set-filesize", 20, "@" },
     { oHonorHttpProxy,"honor-http-proxy", 0, "@" },
     { oFastListMode,"fast-list-mode", 0, "@" },
+    { oFixedListMode,"fixed-list-mode", 0, "@" },
     { oListOnly, "list-only", 0, "@"},
     { oIgnoreTimeConflict, "ignore-time-conflict", 0, "@" },
+    { oIgnoreCrcError, "ignore-crc-error", 0,"@" },
     { oShowSessionKey, "show-session-key", 0, "@" },
     { oOverrideSessionKey, "override-session-key", 2, "@" },
     { oNoRandomSeedFile,  "no-random-seed-file", 0, "@" },
     { oNoAutoKeyRetrieve, "no-auto-key-retrieve", 0, "@" },
+    { oNoSigCache,         "no-sig-cache", 0, "@" },
+    { oNoSigCreateCheck,   "no-sig-create-check", 0, "@" },
     { oMergeOnly,	  "merge-only", 0, "@" },
+    { oAllowSecretKeyImport, "allow-secret-key-import", 0, "@" },
     { oTryAllSecrets,  "try-all-secrets", 0, "@" },
+    { oEnableSpecialFilenames, "enable-special-filenames", 0, "@" },
+    { oNoExpensiveTrustChecks, "no-expensive-trust-checks", 0, "@" },
+    { aDeleteSecretAndPublicKey, "delete-secret-and-public-key",256, "@" },
     { oEmu3DESS2KBug,  "emulate-3des-s2k-bug", 0, "@"},
     { oEmuMDEncodeBug,	"emulate-md-encode-bug", 0, "@"},
 {0} };
@@ -589,7 +609,7 @@
     char *configname = NULL;
     unsigned configlineno;
     int parse_debug = 0;
-    int default_config =1;
+    int default_config = 1;
     int default_keyring = 1;
     int greeting = 0;
     int nogreeting = 0;
@@ -670,11 +690,21 @@
 	else if ( pargs.r_opt == oStatusFD ) {
 	    /* this is needed to ensure that the status-fd filedescriptor is
 	     * initialized when init_shm_coprocessing() is called */
-	    set_status_fd( pargs.r.ret_int );
+	    set_status_fd( iobuf_translate_file_handle (pargs.r.ret_int, 1) );
 	}
       #endif
     }
 
+  #ifdef HAVE_DOSISH_SYSTEM
+    if ( strchr (opt.homedir,'\\') ) {
+        char *d, *buf = m_alloc (strlen (opt.homedir)+1);
+        const char *s = opt.homedir;
+        for (d=buf,s=opt.homedir; *s; s++)
+            *d++ = *s == '\\'? '/': *s;
+        *d = 0;
+        opt.homedir = buf;
+    }
+  #endif
 
   #ifdef USE_SHM_COPROCESSING
     if( opt.shm_coprocess ) {
@@ -733,6 +763,10 @@
 	  case aExportSecretSub: set_cmd( &cmd, aExportSecretSub); break;
 	  case aDeleteSecretKey: set_cmd( &cmd, aDeleteSecretKey);
 							greeting=1; break;
+	  case aDeleteSecretAndPublicKey:
+            set_cmd( &cmd, aDeleteSecretAndPublicKey);
+            greeting=1; 
+            break;
 	  case aDeleteKey: set_cmd( &cmd, aDeleteKey); greeting=1; break;
 
 	  case aDetachedSign: detached_sig = 1; set_cmd( &cmd, aSign ); break;
@@ -764,6 +798,7 @@
 	  case aEnArmor: set_cmd( &cmd, aEnArmor); break;
 	  case aExportOwnerTrust: set_cmd( &cmd, aExportOwnerTrust); break;
 	  case aImportOwnerTrust: set_cmd( &cmd, aImportOwnerTrust); break;
+          case aPipeMode: set_cmd( &cmd, aPipeMode); break;
 
 	  case oArmor: opt.armor = 1; opt.no_armor=0; break;
 	  case oOutput: opt.outfile = pargs.r.ret_str; break;
@@ -775,14 +810,20 @@
 		    opt.verbose++; opt.list_sigs=1; break;
 	  case oKOption: set_cmd( &cmd, aKMode ); break;
 
-	  case oBatch: opt.batch = 1; greeting = 0; break;
+	  case oBatch: opt.batch = 1; nogreeting = 1; break;
+          case oUseAgent: opt.use_agent = 1; break;
 	  case oAnswerYes: opt.answer_yes = 1; break;
 	  case oAnswerNo: opt.answer_no = 1; break;
 	  case oKeyring: append_to_strlist( &nrings, pargs.r.ret_str); break;
 	  case oDebug: opt.debug |= pargs.r.ret_ulong; break;
 	  case oDebugAll: opt.debug = ~0; break;
-	  case oStatusFD: set_status_fd( pargs.r.ret_int ); break;
-	  case oLoggerFD: log_set_logfile( NULL, pargs.r.ret_int ); break;
+	  case oStatusFD:
+            set_status_fd( iobuf_translate_file_handle (pargs.r.ret_int, 1) );
+            break;
+	  case oLoggerFD:
+            log_set_logfile( NULL,
+                             iobuf_translate_file_handle (pargs.r.ret_int, 1) );
+            break;
 	  case oWithFingerprint:
 		with_fpr=1; /*fall thru*/
 	  case oFingerprint: opt.fingerprint++; break;
@@ -822,7 +863,7 @@
 		    opt.def_recipient_self = 0;
 		    break;
 	  case oNoOptions: break; /* no-options */
-	  case oHomedir: opt.homedir = pargs.r.ret_str; break;
+	  case oHomedir: break;
 	  case oNoBatch: opt.batch = 0; break;
 	  case oWithKeyData: opt.with_key_data=1; /* fall thru */
 	  case oWithColons: opt.with_colons=':'; break;
@@ -895,8 +936,12 @@
 	    add_to_strlist2( &locusr, pargs.r.ret_str, utf8_strings );
 	    break;
 	  case oCompress: opt.compress = pargs.r.ret_int; break;
-	  case oPasswdFD: pwfd = pargs.r.ret_int; break;
-	  case oCommandFD: opt.command_fd = pargs.r.ret_int; break;
+	  case oPasswdFD:
+            pwfd = iobuf_translate_file_handle (pargs.r.ret_int, 0);
+            break;
+	  case oCommandFD:
+            opt.command_fd = iobuf_translate_file_handle (pargs.r.ret_int, 0);
+            break;
 	  case oCipherAlgo: def_cipher_string = m_strdup(pargs.r.ret_str); break;
 	  case oDigestAlgo: def_digest_string = m_strdup(pargs.r.ret_str); break;
 	  case oNoSecmemWarn: secmem_set_flags( secmem_get_flags() | 1 ); break;
@@ -920,14 +965,18 @@
 	  case oDisablePubkeyAlgo:
 		disable_pubkey_algo( string_to_pubkey_algo(pargs.r.ret_str) );
 		break;
+          case oNoSigCache: opt.no_sig_cache = 1; break;
+          case oNoSigCreateCheck: opt.no_sig_create_check = 1; 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;
 	  case oFastListMode: opt.fast_list_mode = 1; break;
+	  case oFixedListMode: opt.fixed_list_mode = 1; break;
 	  case oListOnly: opt.list_only=1; break;
 	  case oIgnoreTimeConflict: opt.ignore_time_conflict = 1; break;
+	  case oIgnoreCrcError: opt.ignore_crc_error = 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;
@@ -935,8 +984,13 @@
 		opt.override_session_key = pargs.r.ret_str;
 		break;
 	  case oMergeOnly: opt.merge_only = 1; break;
+	  case oAllowSecretKeyImport: opt.allow_secret_key_import = 1; break;
 	  case oTryAllSecrets: opt.try_all_secrets = 1; break;
           case oTrustedKey: register_trusted_key( pargs.r.ret_str ); break;
+          case oEnableSpecialFilenames:
+            iobuf_enable_special_filenames (1);
+            break;
+          case oNoExpensiveTrustChecks: opt.no_expensive_trust_checks=1; break;
 
 	  default : pargs.err = configfp? 1:2; break;
 	}
@@ -989,6 +1043,7 @@
     set_debug();
     g10_opt_homedir = opt.homedir;
 
+
     /* must do this after dropping setuid, because string_to...
      * may try to load an module */
     if( def_cipher_string ) {
@@ -1079,11 +1134,11 @@
     if( cmd != aDeArmor && cmd != aEnArmor
 	&& !(cmd == aKMode && argc == 2 ) ) {
 
-	if( !sec_nrings && default_keyring )  /* add default secret rings */
+	if( !sec_nrings || default_keyring )  /* add default secret rings */
 	    add_keyblock_resource("secring.gpg", 0, 1);
 	for(sl = sec_nrings; sl; sl = sl->next )
 	    add_keyblock_resource( sl->d, 0, 1 );
-	if( !nrings && default_keyring )  /* add default ring */
+	if( !nrings || default_keyring )  /* add default ring */
 	    add_keyblock_resource("pubring.gpg", 0, 0);
 	for(sl = nrings; sl; sl = sl->next )
 	    add_keyblock_resource( sl->d, 0, 0 );
@@ -1241,10 +1296,18 @@
 	if( argc != 1 )
 	    wrong_args(_("--delete-key user-id"));
 	username = make_username( fname );
-	if( (rc = delete_key(username, cmd==aDeleteSecretKey)) )
+	if( (rc = delete_key(username, cmd==aDeleteSecretKey, 0)) )
 	    log_error("%s: delete key failed: %s\n", username, g10_errstr(rc) );
 	m_free(username);
 	break;
+      case aDeleteSecretAndPublicKey:
+	if( argc != 1 )
+	    wrong_args(_("--delete-secret-and-public-key user-id"));
+	username = make_username( fname );
+	if( (rc = delete_key(username, 0, 1)) )
+	    log_error("%s: delete key failed: %s\n", username, g10_errstr(rc));
+	m_free(username);
+	break;
 
 
       case aCheckKeys:
@@ -1512,9 +1575,15 @@
 	    wrong_args("--import-ownertrust [file]");
 	import_ownertrust( argc? *argv:NULL );
 	break;
+      
+      case aPipeMode:
+        if ( argc )
+            wrong_args ("--pipemode");
+        run_in_pipemode ();
+        break;
 
       case aListPackets:
-	opt.list_packets=1;
+	opt.list_packets=2;
       default:
 	if( argc > 1 )
 	    wrong_args(_("[filename]"));
@@ -1566,7 +1635,6 @@
     secmem_term();
     rc = rc? rc : log_get_errorcount(0)? 2 :
 			g10_errors_seen? 1 : 0;
-    /*write_status( STATUS_LEAVE );*/
     exit(rc );
 }
 
diff -urN gnupg-1.0.4/g10/getkey.c gnupg-1.0.5/g10/getkey.c
--- gnupg-1.0.4/g10/getkey.c	Thu Sep 14 16:50:39 2000
+++ gnupg-1.0.5/g10/getkey.c	Sat Apr 28 12:21:42 2001
@@ -1,5 +1,5 @@
 /* getkey.c -  Get a key from the database
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -34,10 +34,16 @@
 #include "trustdb.h"
 #include "i18n.h"
 
+
 #define MAX_UNK_CACHE_ENTRIES 1000   /* we use a linked list - so I guess
 				      * this is a reasonable limit */
-#define MAX_PK_CACHE_ENTRIES	50
-#define MAX_UID_CACHE_ENTRIES	50
+#define MAX_PK_CACHE_ENTRIES   200
+#define MAX_UID_CACHE_ENTRIES  200
+
+#if MAX_PK_CACHE_ENTRIES < 2
+  #error We need the cache for key creation
+#endif
+
 
 /* A map of the all characters valid used for word_match()
  * Valid characters are in in this table converted to uppercase.
@@ -94,21 +100,19 @@
 } getkey_item_t;
 
 struct getkey_ctx_s {
-    /* make an array or a linked list from dome fields */
-    int primary;
+    int exact;
     KBNODE keyblock;
-    KBPOS kbpos;
+    KBPOS  kbpos;
+    KBNODE found_key; /* pointer into some keyblock */
     int last_rc;
+    int req_usage;
+    int req_algo;
     ulong count;
     int not_allocated;
     int nitems;
     getkey_item_t items[1];
 };
 
-
-
-
-
 #if 0
 static struct {
     int any;
@@ -118,13 +122,13 @@
 } lkup_stats[21];
 #endif
 
+typedef struct keyid_list {
+    struct keyid_list *next;
+    u32 keyid[2];
+} *keyid_list_t;
 
 
 #if MAX_UNK_CACHE_ENTRIES
-  typedef struct keyid_list {
-      struct keyid_list *next;
-      u32 keyid[2];
-  } *keyid_list_t;
   static keyid_list_t unknown_keyids;
   static int unk_cache_entries;   /* number of entries in unknown keys cache */
   static int unk_cache_disabled;
@@ -146,7 +150,7 @@
 #endif
 typedef struct user_id_db {
     struct user_id_db *next;
-    u32 keyid[2];
+    keyid_list_t keyids;
     int len;
     char name[1];
 } *user_id_db_t;
@@ -156,9 +160,8 @@
 
 
 static char* prepare_word_match( const byte *name );
-static int lookup_pk( GETKEY_CTX ctx, PKT_public_key *pk, KBNODE *ret_kb );
-static int lookup_sk( GETKEY_CTX ctx, PKT_secret_key *sk, KBNODE *ret_kb );
-static u32 subkeys_expiretime( KBNODE node, u32 *mainkid );
+static int lookup( GETKEY_CTX ctx, KBNODE *ret_kb, int secmode );
+static void merge_selfsigs( KBNODE keyblock );
 
 
 #if 0
@@ -179,7 +182,7 @@
 #endif
 
 
-static void
+void
 cache_public_key( PKT_public_key *pk )
 {
   #if MAX_PK_CACHE_ENTRIES
@@ -222,33 +225,100 @@
 }
 
 
+/*
+ * Return the user ID from the given keyblock.
+ * We use the primary uid flag which has been set by the merge_selfsigs
+ * function.  The returned value is only valid as long as then given
+ * keyblock is not changed
+ */
+static const char *
+get_primary_uid ( KBNODE keyblock, size_t *uidlen )
+{
+    KBNODE k;
+    const char *s;
+
+    for (k=keyblock; k; k=k->next ) {
+        if ( k->pkt->pkttype == PKT_USER_ID
+             && k->pkt->pkt.user_id->is_primary ) {
+            *uidlen = k->pkt->pkt.user_id->len;
+            return k->pkt->pkt.user_id->name;
+        }
+    } 
+    /* fixme: returning translatable constants instead of a user ID is 
+     * not good because they are probably not utf-8 encoded. */
+    s = _("[User id not found]");
+    *uidlen = strlen (s);
+    return s;
+}
+
+
+static void
+release_keyid_list ( keyid_list_t k )
+{
+    while (  k ) {
+        keyid_list_t k2 = k->next;
+        m_free (k);
+        k = k2;
+    }
+}
+
 /****************
  * Store the association of keyid and userid
+ * Feed only public keys to this function.
  */
-void
-cache_user_id( PKT_user_id *uid, u32 *keyid )
+static void
+cache_user_id( KBNODE keyblock )
 {
     user_id_db_t r;
+    const char *uid;
+    size_t uidlen;
+    keyid_list_t keyids = NULL;
+    KBNODE k;
+
+    for (k=keyblock; k; k = k->next ) {
+        if ( k->pkt->pkttype == PKT_PUBLIC_KEY
+             || k->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
+            keyid_list_t a = m_alloc_clear ( sizeof *a );
+            /* Hmmm: For a long list of keyids it might be an advantage
+             * to append the keys */
+            keyid_from_pk( k->pkt->pkt.public_key, a->keyid );
+            /* first check for duplicates */
+            for(r=user_id_db; r; r = r->next ) {
+                keyid_list_t b = r->keyids;
+                for ( b = r->keyids; b; b = b->next ) {
+                    if( b->keyid[0] == a->keyid[0]
+                        && b->keyid[1] == a->keyid[1] ) {
+                        if( DBG_CACHE )
+                            log_debug("cache_user_id: already in cache\n");
+                        release_keyid_list ( keyids );
+                        m_free ( a );
+                        return;
+                    }
+                }
+            }
+            /* now put it into the cache */
+            a->next = keyids;
+            keyids = a;
+        }
+    }
+    if ( !keyids )
+        BUG (); /* No key no fun */
 
-    for(r=user_id_db; r; r = r->next )
-	if( r->keyid[0] == keyid[0] && r->keyid[1] == keyid[1] ) {
-	    if( DBG_CACHE )
-	       log_debug("cache_user_id: already in cache\n");
-	    return;
-	}
+
+    uid = get_primary_uid ( keyblock, &uidlen );
 
     if( uid_cache_entries >= MAX_UID_CACHE_ENTRIES ) {
 	/* fixme: use another algorithm to free some cache slots */
 	r = user_id_db;
 	user_id_db = r->next;
+        release_keyid_list ( r->keyids );
 	m_free(r);
 	uid_cache_entries--;
     }
-    r = m_alloc( sizeof *r + uid->len-1 );
-    r->keyid[0] = keyid[0];
-    r->keyid[1] = keyid[1];
-    r->len = uid->len;
-    memcpy(r->name, uid->name, r->len);
+    r = m_alloc( sizeof *r + uidlen-1 );
+    r->keyids = keyids;
+    r->len = uidlen;
+    memcpy(r->name, uid, r->len);
     r->next = user_id_db;
     user_id_db = r;
     uid_cache_entries++;
@@ -287,6 +357,31 @@
 }
 
 
+static void
+pk_from_block ( GETKEY_CTX ctx,
+                PKT_public_key *pk, KBNODE keyblock, const char *namehash )
+{
+    KBNODE a = ctx->found_key ? ctx->found_key : keyblock;
+
+    assert ( a->pkt->pkttype == PKT_PUBLIC_KEY
+             ||  a->pkt->pkttype == PKT_PUBLIC_SUBKEY );
+     
+    copy_public_key_new_namehash( pk, a->pkt->pkt.public_key, namehash);
+}
+
+static void
+sk_from_block ( GETKEY_CTX ctx,
+                PKT_secret_key *sk, KBNODE keyblock )
+{
+    KBNODE a = ctx->found_key ? ctx->found_key : keyblock;
+
+    assert ( a->pkt->pkttype == PKT_SECRET_KEY
+             ||  a->pkt->pkttype == PKT_SECRET_SUBKEY );
+     
+    copy_secret_key( sk, a->pkt->pkt.secret_key);
+}
+
+
 /****************
  * Get a public key and store it into the allocated pk
  * can be called with PK set to NULL to just read it into some
@@ -328,14 +423,22 @@
 
     /* do a lookup */
     {	struct getkey_ctx_s ctx;
+        KBNODE kb = NULL;
 	memset( &ctx, 0, sizeof ctx );
+        ctx.exact = 1; /* use the key ID exactly as given */
 	ctx.not_allocated = 1;
 	ctx.nitems = 1;
 	ctx.items[0].mode = 11;
 	ctx.items[0].keyid[0] = keyid[0];
 	ctx.items[0].keyid[1] = keyid[1];
-	rc = lookup_pk( &ctx, pk, NULL );
+        ctx.req_algo  = pk->req_algo;
+        ctx.req_usage = pk->req_usage;
+	rc = lookup( &ctx, &kb, 0 );
+        if ( !rc ) {
+            pk_from_block ( &ctx, pk, kb, NULL );
+        }
 	get_pubkey_end( &ctx );
+        release_kbnode ( kb );
     }
     if( !rc )
 	goto leave;
@@ -373,19 +476,18 @@
 KBNODE
 get_pubkeyblock( u32 *keyid )
 {
-    PKT_public_key *pk = m_alloc_clear( sizeof *pk );
     struct getkey_ctx_s ctx;
     int rc = 0;
     KBNODE keyblock = NULL;
 
     memset( &ctx, 0, sizeof ctx );
+    /* co need to set exact here because we want the entire block */
     ctx.not_allocated = 1;
     ctx.nitems = 1;
     ctx.items[0].mode = 11;
     ctx.items[0].keyid[0] = keyid[0];
     ctx.items[0].keyid[1] = keyid[1];
-    rc = lookup_pk( &ctx, pk, &keyblock );
-    free_public_key(pk);
+    rc = lookup( &ctx, &keyblock, 0 );
     get_pubkey_end( &ctx );
 
     return rc ? NULL : keyblock;
@@ -402,15 +504,24 @@
 {
     int rc;
     struct getkey_ctx_s ctx;
+    KBNODE kb = NULL;
 
     memset( &ctx, 0, sizeof ctx );
+    ctx.exact = 1; /* use the key ID exactly as given */
     ctx.not_allocated = 1;
     ctx.nitems = 1;
     ctx.items[0].mode = 11;
     ctx.items[0].keyid[0] = keyid[0];
     ctx.items[0].keyid[1] = keyid[1];
-    rc = lookup_sk( &ctx, sk, NULL );
+    ctx.req_algo  = sk->req_algo;
+    ctx.req_usage = sk->req_usage;
+    rc = lookup( &ctx, &kb, 1 );
+    if ( !rc ) {
+        sk_from_block ( &ctx, sk, kb );
+    }
     get_seckey_end( &ctx );
+    release_kbnode ( kb );
+
     if( !rc ) {
 	/* check the secret key (this may prompt for a passprase to
 	 * unlock the secret key
@@ -423,52 +534,64 @@
 
 
 /****************
- * Get the primary secret key and store it into sk
- * Note: This function does not unprotect the key!
- */
-int
-get_primary_seckey( PKT_secret_key *sk, u32 *keyid )
-{
-    struct getkey_ctx_s ctx;
-    int rc;
-
-    memset( &ctx, 0, sizeof ctx );
-    ctx.not_allocated = 1;
-    ctx.primary = 1;
-    ctx.nitems = 1;
-    ctx.items[0].mode = 11;
-    ctx.items[0].keyid[0] = keyid[0];
-    ctx.items[0].keyid[1] = keyid[1];
-    rc = lookup_sk( &ctx, sk, NULL );
-    get_seckey_end( &ctx );
-    return rc;
-}
-
-
-
-/****************
- * Check whether the secret key is available
+ * Check whether the secret key is available.  This is just a fast
+ * check and does not tell us whether the secret key is valid.  It
+ * merely tells other whether there is some secret key.
  * Returns: 0 := key is available
- *	    G10ERR_NO_SECKEY := not availabe
+ * G10ERR_NO_SECKEY := not availabe
  */
 int
 seckey_available( u32 *keyid )
 {
+#if 0
     int rc;
     struct getkey_ctx_s ctx;
-    PKT_secret_key *sk;
+    KBNODE kb = NULL;
 
-    sk = m_alloc_clear( sizeof *sk );
     memset( &ctx, 0, sizeof ctx );
+    ctx.exact = 1; /* use the key ID exactly as given */
     ctx.not_allocated = 1;
     ctx.nitems = 1;
     ctx.items[0].mode = 11;
     ctx.items[0].keyid[0] = keyid[0];
     ctx.items[0].keyid[1] = keyid[1];
-    rc = lookup_sk( &ctx, sk, NULL );
+    rc = lookup( &ctx, &kb, 1 );
     get_seckey_end( &ctx );
-    free_secret_key( sk );
+    release_kbnode ( kb );
     return rc;
+#endif
+    int rc;
+    int found = 0;
+    int oldmode = set_packet_list_mode (0);
+    KBNODE keyblock = NULL; 
+    KBPOS  kbpos;
+
+    rc = enum_keyblocks ( 5, &kbpos, NULL );
+    if ( !rc ) {
+	while ( !(rc = enum_keyblocks (1, &kbpos, &keyblock)) ) {
+            KBNODE k;
+
+            for (k=keyblock; k; k = k->next ) {
+                if ( k->pkt->pkttype == PKT_SECRET_KEY
+                     || k->pkt->pkttype == PKT_SECRET_SUBKEY ) {
+                    u32 aki[2];
+                    keyid_from_sk (k->pkt->pkt.secret_key, aki );
+                    if( aki[1] == keyid[1] && aki[0] == keyid[0] ) {
+                        found = 1;
+                        goto leave;
+                    }
+                }
+            }
+            release_kbnode (keyblock); keyblock = NULL;
+	}
+    }
+    if( rc && rc != -1 )
+	log_error ("enum_keyblocks failed: %s\n", g10_errstr(rc));
+ leave:
+    release_kbnode (keyblock); 
+    enum_keyblocks ( 2, &kbpos, NULL );
+    set_packet_list_mode (oldmode);
+    return found? 0 : G10ERR_NO_SECKEY;
 }
 
 
@@ -515,6 +638,8 @@
  * 12 = it is a trustdb index (keyid is looked up)
  * 16 = it is a 16 byte fingerprint
  * 20 = it is a 20 byte fingerprint
+ * 21 = Unified fingerprint :fpr:pk_algo:
+ *      (We don't use pk_algo yet)
  *
  * if fprint is not NULL, it should be an array of at least 20 bytes.
  *
@@ -526,6 +651,8 @@
  *   must be in the range 0..9), this is considered a fingerprint.
  * - If the username starts with a left angle, we assume it is a complete
  *   email address and look only at this part.
+ * - If the username starts with a colon we assume it is a unified 
+ *   key specfification. 
  * - If the username starts with a '.', we assume it is the ending
  *   part of an email address
  * - If the username starts with an '@', we assume it is a part of an
@@ -540,15 +667,16 @@
  *   is not case sensitive.
  */
 
-int
-classify_user_id( const char *name, u32 *keyid, byte *fprint,
-		  const char **retstr, size_t *retlen )
+static int
+classify_user_id2( const char *name, u32 *keyid, byte *fprint,
+		  const char **retstr, size_t *retlen, int *force_exact )
 {
     const char *	s;
     int 		mode = 0;
     int 		hexprefix = 0;
     int 		hexlength;
-
+    
+    *force_exact = 0;
     /* skip leading spaces.   FIXME: what is with leading spaces? */
     for(s = name; *s && isspace(*s); s++ )
 	;
@@ -594,7 +722,32 @@
 		    keyid[0] = keyid[1] = 0;
 	    }
 	    break;
-
+        
+        case ':': /*Unified fingerprint */
+            {  
+                const char *se, *si;
+                int i;
+                
+                se = strchr( ++s,':');
+                if ( !se )
+                    return 0;
+                for (i=0,si=s; si < se; si++, i++ ) {
+                    if ( !strchr("01234567890abcdefABCDEF", *si ) )
+                        return 0; /* invalid digit */
+                }
+                if (i != 32 && i != 40)
+                    return 0; /* invalid length of fpr*/
+		if (fprint) {
+		    for (i=0,si=s; si < se; i++, si +=2) 
+			fprint[i] = hextobyte(si);
+                    for ( ; i < 20; i++)
+                        fprint[i]= 0;
+		}
+                s = se + 1;
+                mode = 21;
+            } 
+            break;
+           
 	default:
 	    if (s[0] == '0' && s[1] == 'x') {
 		hexprefix = 1;
@@ -602,6 +755,10 @@
 	    }
 
 	    hexlength = strspn(s, "0123456789abcdefABCDEF");
+            if (hexlength >= 8 && s[hexlength] =='!') {
+                *force_exact = 1;
+                hexlength++; /* just for the following check */
+            }
 
 	    /* check if a hexadecimal number is terminated by EOS or blank */
 	    if (hexlength && s[hexlength] && !isspace(s[hexlength])) {
@@ -611,7 +768,11 @@
 		    hexlength = 0;  /* a hex number, but really were not. */
 	    }
 
-	    if (hexlength == 8 || (!hexprefix && hexlength == 9 && *s == '0')){
+            if (*force_exact)
+                hexlength--;
+
+	    if (hexlength == 8
+                || (!hexprefix && hexlength == 9 && *s == '0')){
 		/* short keyid */
 		if (hexlength == 9)
 		    s++;
@@ -621,8 +782,8 @@
 		}
 		mode = 10;
 	    }
-	    else if (hexlength == 16 || (!hexprefix && hexlength == 17
-							  && *s == '0')) {
+	    else if (hexlength == 16
+                     || (!hexprefix && hexlength == 17 && *s == '0')) {
 		/* complete keyid */
 		char buf[9];
 		if (hexlength == 17)
@@ -669,6 +830,7 @@
 		if (hexprefix)	/* This was a hex number with a prefix */
 		    return 0;	/* and a wrong length */
 
+                *force_exact = 0;
 		mode = 2;   /* Default is case insensitive substring search */
 	    }
     }
@@ -681,45 +843,57 @@
     return mode;
 }
 
-
+int
+classify_user_id( const char *name, u32 *keyid, byte *fprint,
+		  const char **retstr, size_t *retlen )
+{
+    int dummy;
+    return classify_user_id2 (name, keyid, fprint, retstr, retlen, &dummy);
+}
 
 /****************
  * Try to get the pubkey by the userid. This function looks for the
  * first pubkey certificate which has the given name in a user_id.
  * if pk/sk has the pubkey algo set, the function will only return
  * a pubkey with that algo.
- * The caller must provide provide storage for either the pk or the sk.
- * If ret_kb is not NULL the funtion will return the keyblock there.
+ * The caller should provide storage for either the pk or the sk.
+ * If ret_kb is not NULL the function will return the keyblock there.
  */
 
 static int
 key_byname( GETKEY_CTX *retctx, STRLIST namelist,
-	    PKT_public_key *pk, PKT_secret_key *sk, KBNODE *ret_kb )
+	    PKT_public_key *pk, PKT_secret_key *sk, int secmode,
+            KBNODE *ret_kb )
 {
     int rc = 0;
     int n;
     STRLIST r;
     GETKEY_CTX ctx;
-
+    KBNODE help_kb = NULL;
+    int exact;
+    
     if( retctx ) /* reset the returned context in case of error */
 	*retctx = NULL;
-    assert( !pk ^ !sk );
 
     /* build the search context */
     /* Performance hint: Use a static buffer if there is only one name */
     /*			 and we don't have mode 6 */
     for(n=0, r=namelist; r; r = r->next )
 	n++;
-    ctx = m_alloc_clear( sizeof *ctx + (n-1)*sizeof ctx->items );
+    ctx = m_alloc_clear(  sizeof *ctx + (n-1)*sizeof ctx->items );
     ctx->nitems = n;
 
     for(n=0, r=namelist; r; r = r->next, n++ ) {
-	ctx->items[n].mode = classify_user_id( r->d,
-					      ctx->items[n].keyid,
-					      ctx->items[n].fprint,
-					      &ctx->items[n].name,
-					      NULL );
-	if( !ctx->items[n].mode ) {
+	int mode = classify_user_id2 ( r->d,
+                                       ctx->items[n].keyid,
+                                       ctx->items[n].fprint,
+                                       &ctx->items[n].name,
+                                       NULL, &exact );
+
+        if ( exact )
+            ctx->exact = 1;
+	ctx->items[n].mode = mode;
+        if( !ctx->items[n].mode ) {
 	    m_free( ctx );
 	    return G10ERR_INV_USER_ID;
 	}
@@ -729,18 +903,40 @@
 	}
     }
 
-    /* and call the lookup function */
-    ctx->primary = 1; /* we want to look for the primary key only */
-    if( sk )
-	rc = lookup_sk( ctx, sk, ret_kb );
-    else
-	rc = lookup_pk( ctx, pk, ret_kb );
+
+
+    if ( !ret_kb ) 
+        ret_kb = &help_kb;
+
+    if( secmode ) {
+        if (sk) {
+            ctx->req_algo  = sk->req_algo;
+            ctx->req_usage = sk->req_usage;
+        }
+	rc = lookup( ctx, ret_kb, 1 );
+        if ( !rc && sk ) {
+            sk_from_block ( ctx, sk, *ret_kb );
+        }
+    }
+    else {
+        if (pk) {
+            ctx->req_algo  = pk->req_algo;
+            ctx->req_usage = pk->req_usage;
+        }
+	rc = lookup( ctx, ret_kb, 0 );
+        if ( !rc && pk ) {
+            pk_from_block ( ctx, pk, *ret_kb, NULL /* FIXME need to get the namehash*/ );
+        }
+    }
+
+    release_kbnode ( help_kb );
 
     if( retctx ) /* caller wants the context */
 	*retctx = ctx;
     else {
 	/* Hmmm, why not get_pubkey-end here?? */
-	enum_keyblocks( 2, &ctx->kbpos, NULL ); /* close */
+	enum_keyblocks( 2, &ctx->kbpos, NULL );
+        memset (&ctx->kbpos, 0, sizeof ctx->kbpos);
 	for(n=0; n < ctx->nitems; n++ )
 	    m_free( ctx->items[n].namebuf );
 	m_free( ctx );
@@ -757,16 +953,7 @@
     STRLIST namelist = NULL;
 
     add_to_strlist( &namelist, name );
-
-    if( !pk ) {
-	/* Performance Hint: key_byname should not need a pk here */
-	pk = m_alloc_clear( sizeof *pk );
-	rc = key_byname( retctx, namelist, pk, NULL, ret_keyblock );
-	free_public_key( pk );
-    }
-    else
-	rc = key_byname( retctx, namelist, pk, NULL, ret_keyblock );
-
+    rc = key_byname( retctx, namelist, pk, NULL, 0, ret_keyblock );
     free_strlist( namelist );
     return rc;
 }
@@ -775,18 +962,7 @@
 get_pubkey_bynames( GETKEY_CTX *retctx, PKT_public_key *pk,
 		    STRLIST names, KBNODE *ret_keyblock )
 {
-    int rc;
-
-    if( !pk ) {
-	/* Performance Hint: key_byname should not need a pk here */
-	pk = m_alloc_clear( sizeof *pk );
-	rc = key_byname( retctx, names, pk, NULL, ret_keyblock );
-	free_public_key( pk );
-    }
-    else
-	rc = key_byname( retctx, names, pk, NULL, ret_keyblock );
-
-    return rc;
+    return key_byname( retctx, names, pk, NULL, 0, ret_keyblock );
 }
 
 int
@@ -794,24 +970,22 @@
 {
     int rc;
 
-    if( !pk ) {
-	/* Performance Hint: lookup_read should not need a pk in this case */
-	pk = m_alloc_clear( sizeof *pk );
-	rc = lookup_pk( ctx, pk, ret_keyblock );
-	free_public_key( pk );
-    }
-    else
-	rc = lookup_pk( ctx, pk, ret_keyblock );
+    rc = lookup( ctx, ret_keyblock, 0 );
+    if ( !rc && pk && ret_keyblock )
+        pk_from_block ( ctx, pk, *ret_keyblock, NULL );
+    
     return rc;
 }
 
+
 void
 get_pubkey_end( GETKEY_CTX ctx )
 {
     if( ctx ) {
 	int n;
 
-	enum_keyblocks( 2, &ctx->kbpos, NULL ); /* close */
+	enum_keyblocks( 2, &ctx->kbpos, NULL ); 
+        memset (&ctx->kbpos, 0, sizeof ctx->kbpos);
 	for(n=0; n < ctx->nitems; n++ )
 	    m_free( ctx->items[n].namebuf );
 	if( !ctx->not_allocated )
@@ -819,22 +993,35 @@
     }
 }
 
+
+
+
 /****************
  * Search for a key with the given fingerprint.
+ * FIXME:
+ * We should replace this with the _byname function.  Thiscsan be done
+ * by creating a userID conforming to the unified fingerprint style. 
  */
 int
-get_pubkey_byfprint( PKT_public_key *pk, const byte *fprint, size_t fprint_len)
+get_pubkey_byfprint( PKT_public_key *pk,
+                     const byte *fprint, size_t fprint_len)
 {
     int rc;
 
     if( fprint_len == 20 || fprint_len == 16 ) {
 	struct getkey_ctx_s ctx;
+        KBNODE kb = NULL;
+
 	memset( &ctx, 0, sizeof ctx );
+        ctx.exact = 1 ;
 	ctx.not_allocated = 1;
 	ctx.nitems = 1;
 	ctx.items[0].mode = fprint_len;
 	memcpy( ctx.items[0].fprint, fprint, fprint_len );
-	rc = lookup_pk( &ctx, pk, NULL );
+	rc = lookup( &ctx, &kb, 0 );
+        if (!rc && pk )
+            pk_from_block ( &ctx, pk, kb, NULL );
+        release_kbnode ( kb );
 	get_pubkey_end( &ctx );
     }
     else
@@ -851,50 +1038,48 @@
 						size_t fprint_len )
 {
     int rc;
-    PKT_public_key *pk = m_alloc_clear( sizeof *pk );
 
     if( fprint_len == 20 || fprint_len == 16 ) {
 	struct getkey_ctx_s ctx;
+
 	memset( &ctx, 0, sizeof ctx );
 	ctx.not_allocated = 1;
 	ctx.nitems = 1;
 	ctx.items[0].mode = fprint_len;
 	memcpy( ctx.items[0].fprint, fprint, fprint_len );
-	rc = lookup_pk( &ctx, pk, ret_keyblock );
+	rc = lookup( &ctx, ret_keyblock, 0 );
 	get_pubkey_end( &ctx );
     }
     else
 	rc = G10ERR_GENERAL; /* Oops */
 
-    free_public_key( pk );
     return rc;
 }
 
 
 
 /****************
- * Search for a key with the given lid and return the complete keyblock
+ * Search for a key with the given lid and return the entire keyblock
  */
 int
 get_keyblock_bylid( KBNODE *ret_keyblock, ulong lid )
 {
     int rc;
-    PKT_public_key *pk = m_alloc_clear( sizeof *pk );
     struct getkey_ctx_s ctx;
     u32 kid[2];
 
     if( keyid_from_lid( lid, kid ) )
 	kid[0] = kid[1] = 0;
     memset( &ctx, 0, sizeof ctx );
+    ctx.exact = 1;
     ctx.not_allocated = 1;
     ctx.nitems = 1;
     ctx.items[0].mode = 12;
     ctx.items[0].keyid[0] = kid[0];
     ctx.items[0].keyid[1] = kid[1];
-    rc = lookup_pk( &ctx, pk, ret_keyblock );
+    rc = lookup( &ctx,  ret_keyblock, 0 );
     get_pubkey_end( &ctx );
 
-    free_public_key( pk );
     return rc;
 }
 
@@ -906,30 +1091,37 @@
  * Get a secret key by name and store it into sk
  * If NAME is NULL use the default key
  */
-int
-get_seckey_byname( PKT_secret_key *sk, const char *name, int unprotect )
+static int
+get_seckey_byname2( GETKEY_CTX *retctx,
+                   PKT_secret_key *sk, const char *name, int unprotect,
+                   KBNODE *retblock )
 {
     STRLIST namelist = NULL;
     int rc;
 
     if( !name && opt.def_secret_key && *opt.def_secret_key ) {
 	add_to_strlist( &namelist, opt.def_secret_key );
-	rc = key_byname( NULL, namelist, NULL, sk, NULL );
+	rc = key_byname( retctx, namelist, NULL, sk, 1, retblock );
     }
     else if( !name ) { /* use the first one as default key */
 	struct getkey_ctx_s ctx;
+        KBNODE kb = NULL;
 
+        assert (!retctx ); /* do we need this at all */
+        assert (!retblock);
 	memset( &ctx, 0, sizeof ctx );
 	ctx.not_allocated = 1;
-	ctx.primary = 1;
 	ctx.nitems = 1;
 	ctx.items[0].mode = 15;
-	rc = lookup_sk( &ctx, sk, NULL );
+	rc = lookup( &ctx, &kb, 1 );
+        if (!rc && sk )
+            sk_from_block ( &ctx, sk, kb );
+        release_kbnode ( kb );
 	get_seckey_end( &ctx );
     }
     else {
 	add_to_strlist( &namelist, name );
-	rc = key_byname( NULL, namelist, NULL, sk, NULL );
+	rc = key_byname( retctx, namelist, NULL, sk, 1, retblock );
     }
 
     free_strlist( namelist );
@@ -940,22 +1132,18 @@
     return rc;
 }
 
+int 
+get_seckey_byname( PKT_secret_key *sk, const char *name, int unlock )
+{
+    return get_seckey_byname2 ( NULL, sk, name, unlock, NULL );
+}
+
+
 int
 get_seckey_bynames( GETKEY_CTX *retctx, PKT_secret_key *sk,
 		    STRLIST names, KBNODE *ret_keyblock )
 {
-    int rc;
-
-    if( !sk ) {
-	/* Performance Hint: key_byname should not need a sk here */
-	sk = m_alloc_secure_clear( sizeof *sk );
-	rc = key_byname( retctx, names, NULL, sk, ret_keyblock );
-	free_secret_key( sk );
-    }
-    else
-	rc = key_byname( retctx, names, NULL, sk, ret_keyblock );
-
-    return rc;
+    return key_byname( retctx, names, NULL, sk, 1, ret_keyblock );
 }
 
 
@@ -964,32 +1152,25 @@
 {
     int rc;
 
-    if( !sk ) {
-	/* Performance Hint: lookup_read should not need a pk in this case */
-	sk = m_alloc_secure_clear( sizeof *sk );
-	rc = lookup_sk( ctx, sk, ret_keyblock );
-	free_secret_key( sk );
-    }
-    else
-	rc = lookup_sk( ctx, sk, ret_keyblock );
+    rc = lookup( ctx, ret_keyblock, 1 );
+    if ( !rc && sk && ret_keyblock )
+        sk_from_block ( ctx, sk, *ret_keyblock );
+
     return rc;
 }
 
+
 void
 get_seckey_end( GETKEY_CTX ctx )
 {
-    if( ctx ) {
-	int n;
-
-	enum_keyblocks( 2, &ctx->kbpos, NULL ); /* close */
-	for(n=0; n < ctx->nitems; n++ )
-	    m_free( ctx->items[n].namebuf );
-	if( !ctx->not_allocated )
-	    m_free( ctx );
-    }
+    get_pubkey_end( ctx );
 }
 
 
+
+/*******************************************************
+ ************** compare functions **********************
+ *******************************************************/
 
 /****************
  * Do a word match (original user id starts with a '+').
@@ -1129,73 +1310,19 @@
 
 
 
-/****************
- * Assume that knode points to a public key packet  and keyblock is
- * the entire keyblock.  This function adds all relevant information from
- * a selfsignature to the public key.
- */
-
-static void
-merge_one_pk_and_selfsig( KBNODE keyblock, KBNODE knode,
-			  PKT_public_key *orig_pk )
-{
-    PKT_public_key *pk = knode->pkt->pkt.public_key;
-    PKT_signature *sig;
-    KBNODE k;
-    u32 kid[2];
-    u32 sigdate = 0;
-
-    assert(    knode->pkt->pkttype == PKT_PUBLIC_KEY
-	    || knode->pkt->pkttype == PKT_PUBLIC_SUBKEY );
-
-    if( pk->version < 4 )
-	return; /* this is only needed for version >=4 packets */
-
-
-    /* find the selfsignature */
-    if( knode->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
-	k = find_kbnode( keyblock, PKT_PUBLIC_KEY );
-	if( !k )
-	   BUG(); /* keyblock without primary key!!! */
-	keyid_from_pk( k->pkt->pkt.public_key, kid );
-    }
-    else
-	keyid_from_pk( pk, kid );
-
-    for(k=knode->next; k; k = k->next ) {
-	if( k->pkt->pkttype == PKT_SIGNATURE
-	    && (sig=k->pkt->pkt.signature)->sig_class >= 0x10
-	    && sig->sig_class <= 0x30
-	    && sig->keyid[0] == kid[0]
-	    && sig->keyid[1] == kid[1]
-	    && sig->version > 3 ) {
-	    /* okay this is a self-signature which can be used.
-	     * We use the latest self-signature.
-	     * FIXME: We should only use this if the signature is valid
-	     *	      but this is time consuming - we must provide another
-	     *	      way to handle this
-	     */
-	    const byte *p;
-	    u32 ed;
-
-	    p = parse_sig_subpkt( sig->hashed_data, SIGSUBPKT_KEY_EXPIRE, NULL );
-	    ed = p? pk->timestamp + buffer_to_u32(p):0;
-	    /* use the latest self signature */
-	    if( sig->timestamp > sigdate ) {
-		pk->expiredate = ed;
-		orig_pk->expiredate = ed;
-		sigdate = sig->timestamp;
-	    }
-	    /* fixme: add usage etc. to pk */
-	}
-	else if( k->pkt->pkttype == PKT_PUBLIC_SUBKEY )
-	    break; /* stop here */
-    }
-}
-
+
+/************************************************
+ ************* Merging stuff ********************
+ ************************************************/
 
 /****************
  * merge all selfsignatures with the keys.
+ * FIXME: replace this at least for the public key parts
+ *        by merge_selfsigs.
+ *        It is still used in keyedit.c and
+ *        at 2 or 3 other places - check whether it is really needed.
+ *        It might be needed by the key edit and import stuff because
+ *        the keylock is changed.
  */
 void
 merge_keys_and_selfsig( KBNODE keyblock )
@@ -1207,6 +1334,13 @@
     u32 kid[2] = { 0, 0 };
     u32 sigdate = 0;
 
+    if (keyblock && keyblock->pkt->pkttype == PKT_PUBLIC_KEY ) {
+        /* divert to our new function */
+        merge_selfsigs (keyblock);
+        return;
+    }
+    /* still need the old one because the new one can't handle secret keys */
+
     for(k=keyblock; k; k = k->next ) {
 	if( k->pkt->pkttype == PKT_PUBLIC_KEY
 	    || k->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
@@ -1217,7 +1351,7 @@
 		keyid_from_pk( pk, kid );
 	    else if( !pk->expiredate ) { /* and subkey */
 		/* insert the expiration date here */
-		pk->expiredate = subkeys_expiretime( k, kid );
+		/*FIXME!!! pk->expiredate = subkeys_expiretime( k, kid );*/
 	    }
 	    sigdate = 0;
 	}
@@ -1265,541 +1399,936 @@
 }
 
 
-static KBNODE
-find_by_name( KBNODE keyblock, PKT_public_key *pk, const char *name,
-	      int mode, byte *namehash, int *use_namehash )
+static void
+fixup_uidnode ( KBNODE uidnode, KBNODE signode )
 {
-    KBNODE k, kk;
+    PKT_user_id   *uid = uidnode->pkt->pkt.user_id;
+    PKT_signature *sig = signode->pkt->pkt.signature;
+    const byte *p;
+    size_t n;
 
-    for(k=keyblock; k; k = k->next ) {
-	if( k->pkt->pkttype == PKT_USER_ID
-	    && !compare_name( k->pkt->pkt.user_id->name,
-			      k->pkt->pkt.user_id->len, name, mode)) {
-	    /* we found a matching name, look for the key */
-	    for(kk=keyblock; kk; kk = kk->next ) {
-		if( (	 kk->pkt->pkttype == PKT_PUBLIC_KEY
-		      || kk->pkt->pkttype == PKT_PUBLIC_SUBKEY )
-		    && ( !pk->pubkey_algo
-			 || pk->pubkey_algo
-			    == kk->pkt->pkt.public_key->pubkey_algo)
-		    && ( !pk->pubkey_usage
-			 || !check_pubkey_algo2(
-			       kk->pkt->pkt.public_key->pubkey_algo,
-						   pk->pubkey_usage ))
-		  )
-		    break;
-	    }
-	    if( kk ) {
-		u32 aki[2];
-		keyid_from_pk( kk->pkt->pkt.public_key, aki );
-		cache_user_id( k->pkt->pkt.user_id, aki );
-		if( k->pkt->pkt.user_id->photo )
-		    rmd160_hash_buffer( namehash,
-					k->pkt->pkt.user_id->photo,
-					k->pkt->pkt.user_id->photolen );
-		else
-		    rmd160_hash_buffer( namehash,
-					k->pkt->pkt.user_id->name,
-					k->pkt->pkt.user_id->len );
-		*use_namehash = 1;
-		return kk;
-	    }
-	    else if( is_RSA(pk->pubkey_algo) )
-		log_error(_("RSA key cannot be used in this version\n"));
-	    else
-		log_error(_("No key for user ID\n"));
-	}
-    }
-    return NULL;
+    uid->created = 0; /* not created == invalid */
+    if ( IS_UID_REV ( sig ) ) {
+        uid->is_revoked = 1;
+        return; /* has been revoked */
+    }
+
+    uid->created = sig->timestamp; /* this one is okay */    
+ 
+    /* store the key flags in the helper variable for later processing */
+    uid->help_key_usage = 0;
+    p = parse_sig_subpkt ( sig->hashed_data, SIGSUBPKT_KEY_FLAGS, &n );
+    if ( p && n ) {
+        /* first octet of the keyflags */   
+        if ( (*p & 3) )
+            uid->help_key_usage |= PUBKEY_USAGE_SIG;
+        if ( (*p & 12) )    
+            uid->help_key_usage |= PUBKEY_USAGE_ENC;
+    }
+
+    /* ditto or the key expiration */
+    uid->help_key_expire = 0;
+    p = parse_sig_subpkt ( sig->hashed_data, SIGSUBPKT_KEY_EXPIRE, NULL);
+    if ( p ) {
+        uid->help_key_expire = sig->timestamp + buffer_to_u32(p);
+    }
+
+    /* Set the primary user ID flag - we will later wipe out some
+     * of them to only have one in out keyblock */
+    uid->is_primary = 0;
+    p = parse_sig_subpkt ( sig->hashed_data, SIGSUBPKT_PRIMARY_UID, NULL );
+    if ( p && *p )
+        uid->is_primary = 1;
+    /* We could also query this from the unhashed area if it is not in
+     * the hased area and then later try to decide which is the better
+     * there should be no security problem with this.
+     * For now we only look at the hashed one. 
+     */
 }
 
-static KBNODE
-find_by_name_sk( KBNODE keyblock, PKT_secret_key *sk, const char *name,
-		 int mode )
+static void
+merge_selfsigs_main( KBNODE keyblock, int *r_revoked )
 {
-    KBNODE k, kk;
+    PKT_public_key *pk = NULL;
+    KBNODE k;
+    u32 kid[2];
+    u32 sigdate = 0, uiddate=0, uiddate2;
+    KBNODE signode, uidnode, uidnode2;
+    u32 curtime = make_timestamp ();
+    unsigned int key_usage = 0;
+    u32 key_expire = 0;
+    int key_expire_seen = 0;
+
+    *r_revoked = 0;
+    if ( keyblock->pkt->pkttype != PKT_PUBLIC_KEY )
+        BUG ();
+    pk = keyblock->pkt->pkt.public_key;
+    pk->created = 0;
+    keyid_from_pk( pk, kid );
+    pk->main_keyid[0] = kid[0];
+    pk->main_keyid[1] = kid[1];
+
+    if ( pk->version < 4 ) {
+        /* before v4 the key packet itself contains the expiration date
+         * and there was noway to change it.  So we also use only the
+         * one from the key packet */
+        key_expire = pk->expiredate;
+        key_expire_seen = 1;
+    }
+
+    /* first pass: find the latest direct key self-signature.
+     * We assume that the newest one overrides all others
+     */
+    signode = NULL;
+    sigdate = 0; /* helper to find the latest signature */
+    for(k=keyblock; k && k->pkt->pkttype != PKT_PUBLIC_SUBKEY; k = k->next ) {
+        if ( k->pkt->pkttype == PKT_SIGNATURE ) {
+            PKT_signature *sig = k->pkt->pkt.signature;
+            if ( sig->keyid[0] == kid[0] && sig->keyid[1]==kid[1] ) { 
+           	if ( check_key_signature( keyblock, k, NULL ) )
+                    ; /* signature did not verify */
+                else if ( IS_KEY_REV (sig) ){
+                    /* key has been revoked - there is no way to override
+                     * such a revocation, so we theoretically can stop now.
+                     * We should not cope with expiration times for revocations
+                     * here because we have to assume that an attacker can
+                     * generate all kinds of signatures.  However due to the
+                     * fact that the key has been revoked it does not harm
+                     * either and by continuing we gather some more info on 
+                     * that key.
+                     */ 
+                    *r_revoked = 1;
+                }
+                else if ( IS_KEY_SIG (sig) && sig->timestamp >= sigdate ) {
+                    const byte *p;
+                    
+                    p = parse_sig_subpkt( sig->hashed_data,
+                                          SIGSUBPKT_SIG_EXPIRE, NULL );
+                    if ( p && (sig->timestamp + buffer_to_u32(p)) >= curtime )
+                        ; /* signature has expired - ignore it */
+                    else {
+                        sigdate = sig->timestamp;
+                        signode = k;
+                    }
+                }
+            }
+        }
+    }
 
-    for(k=keyblock; k; k = k->next ) {
-	if( k->pkt->pkttype == PKT_USER_ID
-	    && !compare_name( k->pkt->pkt.user_id->name,
-			      k->pkt->pkt.user_id->len, name, mode)) {
-	    /* we found a matching name, look for the key */
-	    for(kk=keyblock; kk; kk = kk->next ) {
-		if( (	 kk->pkt->pkttype == PKT_SECRET_KEY
-		      || kk->pkt->pkttype == PKT_SECRET_SUBKEY )
-		    && ( !sk->pubkey_algo
-			 || sk->pubkey_algo
-			    == kk->pkt->pkt.secret_key->pubkey_algo)
-		    && ( !sk->pubkey_usage
-			 || !check_pubkey_algo2(
-			       kk->pkt->pkt.secret_key->pubkey_algo,
-						   sk->pubkey_usage ))
-		  )
-		    break;
-	    }
-	    if( kk ) {
-		u32 aki[2];
-		keyid_from_sk( kk->pkt->pkt.secret_key, aki );
-		cache_user_id( k->pkt->pkt.user_id, aki );
-		return kk;
-	    }
-	    else if( is_RSA(sk->pubkey_algo) )
-		log_error(_("RSA key cannot be used in this version\n"));
-	    else
-		log_error(_("No key for user ID\n"));
-	}
+    if ( signode ) {
+        /* some information from a direct key signature take precedence
+         * over the same information given in UID sigs.
+         */
+        PKT_signature *sig = signode->pkt->pkt.signature;
+        const byte *p;
+        size_t n;
+        
+        p = parse_sig_subpkt ( sig->hashed_data, SIGSUBPKT_KEY_FLAGS, &n );
+        if ( p && n ) {
+            /* first octet of the keyflags */   
+            if ( (*p & 3) )
+                key_usage |= PUBKEY_USAGE_SIG;
+            if ( (*p & 12) )    
+                key_usage |= PUBKEY_USAGE_ENC;
+        }
+
+        if ( pk->version > 3 ) {
+            p = parse_sig_subpkt ( sig->hashed_data,
+                                   SIGSUBPKT_KEY_EXPIRE, NULL);
+            if ( p ) {
+                key_expire = sig->timestamp + buffer_to_u32(p);
+                key_expire_seen = 1;
+            }
+        }
+        /* and set the created field */
+        pk->created = sigdate;
+        /* and mark that key as valid: one direct key signature should 
+         * render a key as valid */
+        pk->is_valid = 1;
     }
-    return NULL;
+
+
+    /* second pass: look at the self-signature of all user IDs */
+    signode = uidnode = NULL;
+    sigdate = 0; /* helper to find the latest signature in one user ID */
+    uiddate = 0; /* and over of all user IDs */
+    for(k=keyblock; k && k->pkt->pkttype != PKT_PUBLIC_SUBKEY; k = k->next ) {
+	if ( k->pkt->pkttype == PKT_USER_ID
+             || k->pkt->pkttype == PKT_PHOTO_ID ) {
+            if ( uidnode && signode ) 
+                fixup_uidnode ( uidnode, signode );
+            uidnode = k;
+            signode = NULL;
+            if ( sigdate > uiddate )
+                uiddate = sigdate;
+            sigdate = 0;
+      	}
+        else if ( k->pkt->pkttype == PKT_SIGNATURE && uidnode ) {
+            PKT_signature *sig = k->pkt->pkt.signature;
+            if ( sig->keyid[0] == kid[0] && sig->keyid[1]==kid[1] ) { 
+                if ( check_key_signature( keyblock, k, NULL ) )
+                    ; /* signature did not verify */
+                else if ( (IS_UID_SIG (sig) || IS_UID_REV (sig))
+                          && sig->timestamp >= sigdate ) {
+                    /* Note: we allow to invalidate cert revocations
+                     * by a newer signature.  An attacker can't use this
+                     * because a key should be revoced with a key revocation.
+                     * The reason why we have to allow for that is that at
+                     * one time an email address may become invalid but later
+                     * the same email address may become valid again (hired,
+                     * fired, hired again).
+                     */                    
+                    const byte *p;
+                    
+                    p = parse_sig_subpkt( sig->hashed_data,
+                                          SIGSUBPKT_SIG_EXPIRE, NULL );
+                    if ( p && (sig->timestamp + buffer_to_u32(p)) >= curtime )
+                        ; /* signature/revocation has expired - ignore it */
+                    else {
+                        sigdate = sig->timestamp;
+                        signode = k;
+                    }
+                }
+            }
+        }
+    }
+    if ( uidnode && signode ) {
+        fixup_uidnode ( uidnode, signode );
+        pk->is_valid = 1;
+    }
+    if ( sigdate > uiddate )
+        uiddate = sigdate;
+    /* if we do not have a direct key signature, take the key creation date
+     * from the latest user ID.  Hmmm, another possibilty would be to take 
+     * it from the latest primary user ID - but we don't implement it for
+     * now */
+    if ( !pk->created )
+        pk->created = uiddate;
+    if ( !pk->created ) {
+        /* oops, still no creation date: use the timestamp */
+        if (DBG_CACHE)
+            log_debug( "merge_selfsigs_main: "
+                       "using timestamp as creation date\n");    
+        pk->created = pk->timestamp;
+    }
+
+    /* Now that we had a look at all user IDs we can now get some information
+     * from those user IDs.
+     */
+    
+    if ( !key_usage ) {
+        /* find the latest user ID with key flags set */
+        uiddate = 0; /* helper to find the latest user ID */
+        for(k=keyblock; k && k->pkt->pkttype != PKT_PUBLIC_SUBKEY;
+            k = k->next ) {
+            if ( k->pkt->pkttype == PKT_USER_ID
+                 || k->pkt->pkttype == PKT_PHOTO_ID ) {
+                PKT_user_id *uid = k->pkt->pkt.user_id;
+                if ( uid->help_key_usage && uid->created > uiddate ) {
+                    key_usage = uid->help_key_usage;
+                    uiddate = uid->created;
+                }
+            }
+      	}
+    }
+    if ( !key_usage ) { /* no key flags at all: get it from the algo */
+        key_usage = openpgp_pk_algo_usage ( pk->pubkey_algo );
+    }
+    else { /* check that the usage matches the usage as given by the algo */
+        int x = openpgp_pk_algo_usage ( pk->pubkey_algo );
+        if ( x ) /* mask it down to the actual allowed usage */
+            key_usage &= x; 
+    }
+    pk->pubkey_usage = key_usage;
+
+    if ( !key_expire_seen ) {
+        /* find the latest valid user ID with a key expiration set 
+         * Note, that this may be a different one from the above because
+         * some user IDs may have no expiration date set */
+        uiddate = 0; 
+        for(k=keyblock; k && k->pkt->pkttype != PKT_PUBLIC_SUBKEY;
+            k = k->next ) {
+            if ( k->pkt->pkttype == PKT_USER_ID
+                 || k->pkt->pkttype == PKT_PHOTO_ID ) {
+                PKT_user_id *uid = k->pkt->pkt.user_id;
+                if ( uid->help_key_expire && uid->created > uiddate ) {
+                    key_expire = uid->help_key_expire;
+                    uiddate = uid->created;
+                }
+            }
+      	}
+    }
+   
+    pk->has_expired = key_expire >= curtime? 0 : key_expire;
+    if ( pk->version >= 4 ) 
+        pk->expiredate = key_expire;
+    /* Fixme: we should see how to get rid of the expiretime fields  but
+     * this needs changes at other palces too. */
+
+    /* and now find the real primary user ID and delete all others */
+    uiddate = uiddate2 = 0;
+    uidnode = uidnode2 = NULL;
+    for(k=keyblock; k && k->pkt->pkttype != PKT_PUBLIC_SUBKEY; k = k->next ) {
+        if ( k->pkt->pkttype == PKT_USER_ID
+             || k->pkt->pkttype == PKT_PHOTO_ID ) {
+            PKT_user_id *uid = k->pkt->pkt.user_id;
+            if ( uid->is_primary && uid->created > uiddate ) {
+                uiddate = uid->created;
+                uidnode = k;
+            }
+            if ( !uid->is_primary && uid->created > uiddate2 ) {
+                uiddate2 = uid->created;
+                uidnode2 = k;
+            }
+        }
+    }
+    if ( uidnode ) {
+        for(k=keyblock; k && k->pkt->pkttype != PKT_PUBLIC_SUBKEY;
+            k = k->next ) {
+            if ( k->pkt->pkttype == PKT_USER_ID
+                 || k->pkt->pkttype == PKT_PHOTO_ID ) {
+                PKT_user_id *uid = k->pkt->pkt.user_id;
+                if ( k != uidnode ) 
+                    uid->is_primary = 0;
+            }
+        }
+    }
+    else if( uidnode2 ) {
+        /* none is flagged primary - use the latest user ID we have */
+        uidnode2->pkt->pkt.user_id->is_primary = 1;
+    }
+
 }
 
 
-static KBNODE
-find_by_keyid( KBNODE keyblock, PKT_public_key *pk, u32 *keyid, int mode )
+static void
+merge_selfsigs_subkey( KBNODE keyblock, KBNODE subnode )
 {
+    PKT_public_key *mainpk = NULL, *subpk = NULL;
+    PKT_signature *sig;
     KBNODE k;
+    u32 mainkid[2];
+    u32 sigdate = 0;
+    KBNODE signode;
+    u32 curtime = make_timestamp ();
+    unsigned int key_usage = 0;
+    u32 key_expire = 0;
+    const byte *p;
+    size_t n;
 
-    if( DBG_CACHE )
-	log_debug("lookup keyid=%08lx%08lx req_algo=%d mode=%d\n",
-		   (ulong)keyid[0], (ulong)keyid[1], pk->pubkey_algo, mode );
-
-    for(k=keyblock; k; k = k->next ) {
-	if(    k->pkt->pkttype == PKT_PUBLIC_KEY
-	    || k->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
-	    u32 aki[2];
-	    keyid_from_pk( k->pkt->pkt.public_key, aki );
-	    if( DBG_CACHE )
-		log_debug("         aki=%08lx%08lx algo=%d\n",
-				(ulong)aki[0], (ulong)aki[1],
-				 k->pkt->pkt.public_key->pubkey_algo	);
-
-	    if( aki[1] == keyid[1]
-		&& ( mode == 10 || aki[0] == keyid[0] )
-		&& ( !pk->pubkey_algo
-		     || pk->pubkey_algo
-			== k->pkt->pkt.public_key->pubkey_algo) ){
-		KBNODE kk;
-		/* cache the userid */
-		for(kk=keyblock; kk; kk = kk->next )
-		    if( kk->pkt->pkttype == PKT_USER_ID )
-			break;
-		if( kk )
-		    cache_user_id( kk->pkt->pkt.user_id, aki );
-		else
-		    log_error(_("No user ID for key\n"));
-		return k; /* found */
-	    }
-	}
+    if ( subnode->pkt->pkttype != PKT_PUBLIC_SUBKEY )
+        BUG ();
+    mainpk = keyblock->pkt->pkt.public_key;
+    if ( mainpk->version < 4 )
+        return; /* (actually this should never happen) */
+    keyid_from_pk( mainpk, mainkid );
+    subpk = subnode->pkt->pkt.public_key;
+    subpk->is_valid = 0;
+    subpk->main_keyid[0] = mainpk->main_keyid[0];
+    subpk->main_keyid[1] = mainpk->main_keyid[1];
+    if ( subpk->version < 4 )
+        return; /* there are no v3 subkeys */
+
+    /* find the latest key binding self-signature. */
+    signode = NULL;
+    sigdate = 0; /* helper to find the latest signature */
+    for(k=subnode->next; k && k->pkt->pkttype != PKT_PUBLIC_SUBKEY;
+                                                        k = k->next ) {
+        if ( k->pkt->pkttype == PKT_SIGNATURE ) {
+            sig = k->pkt->pkt.signature;
+            if ( sig->keyid[0] == mainkid[0] && sig->keyid[1]==mainkid[1] ) { 
+           	if ( check_key_signature( keyblock, k, NULL ) )
+                    ; /* signature did not verify */
+                else if ( IS_SUBKEY_REV (sig) ) {
+                    subpk->is_revoked = 1;
+                    /* although we could stop now, we continue to 
+                     * figure out other information like the old expiration
+                     * time */
+                }
+                else if ( IS_SUBKEY_SIG (sig) && sig->timestamp >= sigdate ) {
+                    p = parse_sig_subpkt( sig->hashed_data,
+                                          SIGSUBPKT_SIG_EXPIRE, NULL );
+                    if ( p && (sig->timestamp + buffer_to_u32(p)) >= curtime )
+                        ; /* signature has expired - ignore it */
+                    else {
+                        sigdate = sig->timestamp;
+                        signode = k;
+                    }
+                }
+            }
+        }
     }
-    return NULL;
+
+    if ( !signode ) {
+        subpk->created = subpk->timestamp;
+        return;  /* no valid key binding */
+    }
+
+    subpk->is_valid = 1;
+    subpk->created = sigdate; 
+    sig = signode->pkt->pkt.signature;
+        
+    p = parse_sig_subpkt ( sig->hashed_data, SIGSUBPKT_KEY_FLAGS, &n );
+    if ( p && n ) {
+        /* first octet of the keyflags */   
+        if ( (*p & 3) )
+            key_usage |= PUBKEY_USAGE_SIG;
+        if ( (*p & 12) )    
+            key_usage |= PUBKEY_USAGE_ENC;
+    }
+    if ( !key_usage ) { /* no key flags at all: get it from the algo */
+        key_usage = openpgp_pk_algo_usage ( subpk->pubkey_algo );
+    }
+    else { /* check that the usage matches the usage as given by the algo */
+        int x = openpgp_pk_algo_usage ( subpk->pubkey_algo );
+        if ( x ) /* mask it down to the actual allowed usage */
+            key_usage &= x; 
+    }
+    subpk->pubkey_usage = key_usage;
+    
+    p = parse_sig_subpkt ( sig->hashed_data, SIGSUBPKT_KEY_EXPIRE, NULL);
+
+    if ( p ) 
+        key_expire = sig->timestamp + buffer_to_u32(p);
+    else
+        key_expire = 0;
+    subpk->has_expired = key_expire >= curtime? 0 : key_expire;
+    subpk->expiredate = key_expire;
 }
 
-static KBNODE
-find_by_keyid_sk( KBNODE keyblock, PKT_secret_key *sk, u32 *keyid, int mode )
+
+
+/* 
+ * Merge information from the self-signatures with the key, so that
+ * we can later use them more easy.
+ * The function works by first applying the self signatures to the
+ * primary key and the to each subkey.
+ * Here are the rules we use to decide which inormation from which
+ * self-signature is used:
+ * We check all self signatures or validity and ignore all invalid signatures.
+ * All signatures are then ordered by their creation date ....
+ * For the primary key:
+ *   FIXME the docs    
+ */
+static void
+merge_selfsigs( KBNODE keyblock )
 {
     KBNODE k;
+    int revoked;
+    PKT_public_key *main_pk;
 
-    if( DBG_CACHE )
-	log_debug("lookup_sk keyid=%08lx%08lx req_algo=%d mode=%d\n",
-		   (ulong)keyid[0], (ulong)keyid[1], sk->pubkey_algo, mode );
+    if ( keyblock->pkt->pkttype != PKT_PUBLIC_KEY )
+        BUG ();
 
-    for(k=keyblock; k; k = k->next ) {
-	if(    k->pkt->pkttype == PKT_SECRET_KEY
-	    || k->pkt->pkttype == PKT_SECRET_SUBKEY ) {
-	    u32 aki[2];
-	    keyid_from_sk( k->pkt->pkt.secret_key, aki );
-	    if( DBG_CACHE )
-		log_debug("         aki=%08lx%08lx algo=%d\n",
-				(ulong)aki[0], (ulong)aki[1],
-				 k->pkt->pkt.secret_key->pubkey_algo	);
-
-	    if( aki[1] == keyid[1]
-		&& ( mode == 10 || aki[0] == keyid[0] )
-		&& ( !sk->pubkey_algo
-		     || sk->pubkey_algo
-			== k->pkt->pkt.secret_key->pubkey_algo) ){
-		KBNODE kk;
-		/* cache the userid */
-		for(kk=keyblock; kk; kk = kk->next )
-		    if( kk->pkt->pkttype == PKT_USER_ID )
-			break;
-		if( kk )
-		    cache_user_id( kk->pkt->pkt.user_id, aki );
-		else
-		    log_error(_("No user ID for key\n"));
-		return k; /* found */
-	    }
+    merge_selfsigs_main ( keyblock, &revoked );
+    main_pk = keyblock->pkt->pkt.public_key;
+    if ( revoked ) {
+        /* if the primary key has been revoked we better set the revoke
+         * flag on that key and all subkeys */
+        for(k=keyblock; k; k = k->next ) {
+            if ( k->pkt->pkttype == PKT_PUBLIC_KEY
+                || k->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
+                PKT_public_key *pk = k->pkt->pkt.public_key;
+                pk->is_revoked = 1;
+                pk->main_keyid[0] = main_pk->main_keyid[0];
+                pk->main_keyid[1] = main_pk->main_keyid[1];
+            }
 	}
+        return;
+    }
+
+    /* now merge in the data from each of the subkeys */
+    for(k=keyblock; k; k = k->next ) {
+	if (  k->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
+            merge_selfsigs_subkey ( keyblock, k );
+        }
     }
-    return NULL;
 }
 
 
-static KBNODE
-find_first( KBNODE keyblock, PKT_public_key *pk )
+/*
+ * Merge the secret keys from secblock into the pubblock thereby
+ * replacing the public (sub)keys with their secret counterparts Hmmm:
+ * It might be better to get away from the concept of entire secret
+ * keys at all and have a way to store just the real secret parts
+ * from the key.
+ */
+static void
+merge_public_with_secret ( KBNODE pubblock, KBNODE secblock )
 {
-    KBNODE k;
+    KBNODE pub;
 
-    for(k=keyblock; k; k = k->next ) {
-	if(    k->pkt->pkttype == PKT_PUBLIC_KEY
-	    || k->pkt->pkttype == PKT_PUBLIC_SUBKEY )
-	{
-	    if( !pk->pubkey_algo
-		|| pk->pubkey_algo == k->pkt->pkt.public_key->pubkey_algo )
-		return k;
-	}
+    assert ( pubblock->pkt->pkttype == PKT_PUBLIC_KEY );
+    assert ( secblock->pkt->pkttype == PKT_SECRET_KEY );
+    
+    for (pub=pubblock; pub; pub = pub->next ) {
+        if ( pub->pkt->pkttype == PKT_PUBLIC_KEY ) {
+             PKT_public_key *pk = pub->pkt->pkt.public_key;
+             PKT_secret_key *sk = secblock->pkt->pkt.secret_key;
+             assert ( pub == pubblock ); /* only in the first node */
+             /* there is nothing to compare in this case, so just replace
+              * some information */
+             copy_public_parts_to_secret_key ( pk, sk );
+             free_public_key ( pk );
+             pub->pkt->pkttype = PKT_SECRET_KEY;
+             pub->pkt->pkt.secret_key = copy_secret_key (NULL, sk);
+        }
+        else if ( pub->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
+            KBNODE sec;
+            PKT_public_key *pk = pub->pkt->pkt.public_key;
+
+            /* this is more complicated: it may happen that the sequence
+             * of the subkeys dosn't match, so we have to find the
+             * appropriate secret key */
+            for (sec=secblock->next; sec; sec = sec->next ) {
+                if ( sec->pkt->pkttype == PKT_SECRET_SUBKEY ) {
+                    PKT_secret_key *sk = sec->pkt->pkt.secret_key;
+                    if ( !cmp_public_secret_key ( pk, sk ) ) {
+                        copy_public_parts_to_secret_key ( pk, sk );
+                        free_public_key ( pk );
+                        pub->pkt->pkttype = PKT_SECRET_SUBKEY;
+                        pub->pkt->pkt.secret_key = copy_secret_key (NULL, sk);
+                        break;
+                    }
+                }
+            }
+            if ( !sec ) 
+                BUG(); /* already checked in premerge */
+        }
     }
-    return NULL;
 }
 
-static KBNODE
-find_first_sk( KBNODE keyblock, PKT_secret_key *sk )
+/* This function checks that for every public subkey a corresponding
+ * secret subkey is avalable and deletes the public subkey otherwise.
+ * We need this function becuase we can'tdelete it later when we
+ * actually merge the secret parts into the pubring.
+ */
+static void
+premerge_public_with_secret ( KBNODE pubblock, KBNODE secblock )
+{
+    KBNODE last, pub;
+
+    assert ( pubblock->pkt->pkttype == PKT_PUBLIC_KEY );
+    assert ( secblock->pkt->pkttype == PKT_SECRET_KEY );
+    
+    for (pub=pubblock,last=NULL; pub; last = pub, pub = pub->next ) {
+        if ( pub->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
+            KBNODE sec;
+            PKT_public_key *pk = pub->pkt->pkt.public_key;
+
+            for (sec=secblock->next; sec; sec = sec->next ) {
+                if ( sec->pkt->pkttype == PKT_SECRET_SUBKEY ) {
+                    PKT_secret_key *sk = sec->pkt->pkt.secret_key;
+                    if ( !cmp_public_secret_key ( pk, sk ) ) {
+                        if ( sk->protect.s2k.mode == 1001 ) {
+                            /* The secret parts are not available so
+                               we can't use that key for signing etc.
+                               Fix the pubkey usage */
+                            pk->pubkey_usage &= ~PUBKEY_USAGE_SIG;
+                        }
+                        break;
+                    }
+                }
+            }
+            if ( !sec ) {
+                KBNODE next, ll;
+
+                log_info ( "no secret subkey "
+                           "for public subkey %08lX - ignoring\n",  
+                           (ulong)keyid_from_pk (pk,NULL) );
+                /* we have to remove the subkey in this case */
+                assert ( last );
+                /* find the next subkey */
+                for (next=pub->next,ll=pub;
+                     next && pub->pkt->pkttype != PKT_PUBLIC_SUBKEY;
+                     ll = next, next = next->next ) 
+                    ;
+                /* make new link */
+                last->next = next;
+                /* release this public subkey with all sigs */
+                ll->next = NULL;
+                release_kbnode( pub );
+                /* let the loop continue */
+                pub = last;
+            }
+        }
+    }
+}
+
+
+
+
+/************************************************
+ ************* Find stuff ***********************
+ ************************************************/
+
+static int 
+find_by_name( KBNODE keyblock, const char *name,
+	      int mode, byte *namehash )
 {
     KBNODE k;
 
     for(k=keyblock; k; k = k->next ) {
-	if(    k->pkt->pkttype == PKT_SECRET_KEY
-	    || k->pkt->pkttype == PKT_SECRET_SUBKEY )
-	{
-	    if( !sk->pubkey_algo
-		|| sk->pubkey_algo == k->pkt->pkt.secret_key->pubkey_algo )
-		return k;
-	}
+	if( k->pkt->pkttype == PKT_USER_ID
+	    && !compare_name( k->pkt->pkt.user_id->name,
+			      k->pkt->pkt.user_id->len, name, mode)) {
+	    /* we found a matching name, look for the key */
+            if( k->pkt->pkt.user_id->photo ) {
+                /* oops: this can never happen */
+                rmd160_hash_buffer( namehash,
+                                    k->pkt->pkt.user_id->photo,
+                                    k->pkt->pkt.user_id->photolen );
+            }
+            else {
+                rmd160_hash_buffer( namehash,
+                                    k->pkt->pkt.user_id->name,
+                                    k->pkt->pkt.user_id->len );
+            }
+            return 1; 
+        }
     }
-    return NULL;
+    
+    return 0;
 }
 
 
+
 static KBNODE
-find_by_fpr( KBNODE keyblock, PKT_public_key *pk, const char *name, int mode )
+find_by_keyid( KBNODE keyblock, u32 *keyid, int mode )
 {
     KBNODE k;
 
     for(k=keyblock; k; k = k->next ) {
 	if(    k->pkt->pkttype == PKT_PUBLIC_KEY
 	    || k->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
-	    byte afp[MAX_FINGERPRINT_LEN];
-	    size_t an;
-
-	    fingerprint_from_pk(k->pkt->pkt.public_key, afp, &an );
-
-	    if( DBG_CACHE ) {
-		u32 aki[2];
-		keyid_from_pk( k->pkt->pkt.public_key, aki );
-		log_debug("         aki=%08lx%08lx algo=%d mode=%d an=%u\n",
-				(ulong)aki[0], (ulong)aki[1],
-			k->pkt->pkt.public_key->pubkey_algo, mode,
-							    (unsigned)an );
+	    u32 aki[2];
+	    keyid_from_pk( k->pkt->pkt.public_key, aki );
+	    if( aki[1] == keyid[1] && ( mode == 10 || aki[0] == keyid[0] ) ) {
+                return k; /* found */
 	    }
-
-	    if( an == mode
-		&& !memcmp( afp, name, an)
-		&& ( !pk->pubkey_algo
-		     || pk->pubkey_algo == k->pkt->pkt.public_key->pubkey_algo) )
-		return k;
 	}
     }
     return NULL;
 }
 
+
+
 static KBNODE
-find_by_fpr_sk( KBNODE keyblock, PKT_secret_key *sk,
-				 const char *name, int mode )
+find_by_fpr( KBNODE keyblock,  const char *name, int mode )
 {
     KBNODE k;
 
     for(k=keyblock; k; k = k->next ) {
-	if(    k->pkt->pkttype == PKT_SECRET_KEY
-	    || k->pkt->pkttype == PKT_SECRET_SUBKEY ) {
+	if(    k->pkt->pkttype == PKT_PUBLIC_KEY
+	    || k->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
 	    byte afp[MAX_FINGERPRINT_LEN];
 	    size_t an;
 
-	    fingerprint_from_sk(k->pkt->pkt.secret_key, afp, &an );
-
-	    if( DBG_CACHE ) {
-		u32 aki[2];
-		keyid_from_sk( k->pkt->pkt.secret_key, aki );
-		log_debug("         aki=%08lx%08lx algo=%d mode=%d an=%u\n",
-				(ulong)aki[0], (ulong)aki[1],
-			k->pkt->pkt.secret_key->pubkey_algo, mode,
-							(unsigned)an );
-	    }
-
-	    if( an == mode
-		&& !memcmp( afp, name, an)
-		&& ( !sk->pubkey_algo
-		     || sk->pubkey_algo == k->pkt->pkt.secret_key->pubkey_algo) )
-		return k;
+	    fingerprint_from_pk(k->pkt->pkt.public_key, afp, &an );
+            if ( mode == 21 ) {
+                /* Unified fingerprint. The fingerprint is always 20 bytes*/
+                while ( an < 20 )
+                    afp[an++] = 0;
+                if ( !memcmp( afp, name, 20 ) )
+                    return k;
+            }
+	    else { 
+                if( an == mode && !memcmp( afp, name, an) ) {
+                    return k;
+                }
+            }
 	}
     }
     return NULL;
 }
 
 
-/****************
- * Return the expiretime of a subkey.
- */
-static u32
-subkeys_expiretime( KBNODE node, u32 *mainkid )
-{
-    KBNODE k;
-    PKT_signature *sig;
-    u32 expires = 0, sigdate = 0;
-
-    assert( node->pkt->pkttype == PKT_PUBLIC_SUBKEY );
-    for(k=node->next; k; k = k->next ) {
-	if( k->pkt->pkttype == PKT_SIGNATURE
-	    && (sig=k->pkt->pkt.signature)->sig_class == 0x18
-	    && sig->keyid[0] == mainkid[0]
-	    && sig->keyid[1] == mainkid[1]
-	    && sig->version > 3
-	    && sig->timestamp > sigdate ) {
-	    /* okay this is a key-binding which can be used.
-	     * We use the latest self-signature.
-	     * FIXME: We should only use this if the binding signature is valid
-	     *	      but this is time consuming - we must provide another
-	     *	      way to handle this
-	     */
-	    const byte *p;
-	    u32 ed;
-
-	    p = parse_sig_subpkt( sig->hashed_data, SIGSUBPKT_KEY_EXPIRE, NULL );
-	    ed = p? node->pkt->pkt.public_key->timestamp + buffer_to_u32(p):0;
-	    sigdate = sig->timestamp;
-	    expires = ed;
-	}
-	else if( k->pkt->pkttype == PKT_PUBLIC_SUBKEY )
-	    break; /* stop at the next subkey */
-    }
-
-    return expires;
-}
 
 
-/****************
- * Check whether the subkey has expired.  Node must point to the subkey
+/* See see whether the key fits
+ * our requirements and in case we do not
+ * request the primary key, we should select
+ * a suitable subkey.
+ * FIXME: Check against PGP 7 whether we still need a kludge
+ *        to favor type 16 keys over type 20 keys when type 20
+ *        has not been explitely requested.
+ * Returns: True when a suitable key has been found.
+ *
+ * We have to distinguish four cases:  FIXME!
+ *  1. No usage and no primary key requested
+ *     Examples for this case are that we have a keyID to be used
+ *     for decrytion or verification.
+ *  2. No usage but primary key requested
+ *     This is the case for all functions which work on an
+ *     entire keyblock, e.g. for editing or listing
+ *  3. Usage and primary key requested
+ *     FXME
+ *  4. Usage but no primary key requested
+ *     FIXME
+ * FIXME: Tell what is going to happen here and something about the rationale
+ * Note: We don't use this function if no specific usage is requested;
+ *       This way the getkey functions can be used for plain key listings.
+ *
+ * CTX ist the keyblock we are investigating, if FOUNDK is not NULL this
+ * is the key we actually found by looking at the keyid or a fingerprint and
+ * may eitehr point to the primary or one of the subkeys.
  */
+
 static int
-has_expired( KBNODE node, u32 *mainkid, u32 cur_time )
+finish_lookup( GETKEY_CTX ctx,  KBNODE foundk )
 {
-    u32 expires = subkeys_expiretime( node, mainkid );
-    return expires && expires <= cur_time;
-}
+    KBNODE keyblock = ctx->keyblock;
+    KBNODE k;
+  #define USAGE_MASK  (PUBKEY_USAGE_SIG|PUBKEY_USAGE_ENC)
+    unsigned int req_usage = ( ctx->req_usage & USAGE_MASK );
+    u32 latest_date;
+    KBNODE latest_key;
 
-static void
-finish_lookup( KBNODE keyblock, PKT_public_key *pk, KBNODE k, byte *namehash,
-					       int use_namehash, int primary )
-{
-    assert(    k->pkt->pkttype == PKT_PUBLIC_KEY
-	    || k->pkt->pkttype == PKT_PUBLIC_SUBKEY );
+    assert( !foundk || foundk->pkt->pkttype == PKT_PUBLIC_KEY
+	            || foundk->pkt->pkttype == PKT_PUBLIC_SUBKEY );
     assert( keyblock->pkt->pkttype == PKT_PUBLIC_KEY );
-    if( primary && !pk->pubkey_usage ) {
-	copy_public_key_new_namehash( pk, keyblock->pkt->pkt.public_key,
-				      use_namehash? namehash:NULL);
-	merge_one_pk_and_selfsig( keyblock, keyblock, pk );
-    }
-    else {
-	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 */
-	    KBNODE save_k = k;
-	    u32 mainkid[2];
-	    u32 cur_time = make_timestamp();
-
-	    keyid_from_pk( keyblock->pkt->pkt.public_key, mainkid );
-
-	    k = NULL;
-	    /* kludge for pgp 5: which doesn't accept type 20:
-	     * try to use a type 16 subkey instead */
-	    if( pk->pubkey_usage == PUBKEY_USAGE_ENC ) {
-		for( k = save_k; k; k = k->next ) {
-		    if( k->pkt->pkttype == PKT_PUBLIC_SUBKEY
-			&& k->pkt->pkt.public_key->pubkey_algo
-			    == PUBKEY_ALGO_ELGAMAL_E
-			&& !check_pubkey_algo2(
-				k->pkt->pkt.public_key->pubkey_algo,
-						 pk->pubkey_usage )
-			&& !has_expired(k, mainkid, cur_time) )
-			break;
-		}
-	    }
+   
+    ctx->found_key = NULL;
 
-	    if( !k ) {
-		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 )
-			&& ( pk->pubkey_usage != PUBKEY_USAGE_ENC
-			     || !has_expired( k, mainkid, cur_time ) )
-		      )
-			break;
-		}
-	    }
-	    if( !k )
-		k = save_k;
-	    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)
-			);
-	}
+    if (!ctx->exact)
+        foundk = NULL;
 
-	copy_public_key_new_namehash( pk, k->pkt->pkt.public_key,
-				      use_namehash? namehash:NULL);
-	merge_one_pk_and_selfsig( keyblock, k, pk );
-    }
-}
+    if ( DBG_CACHE )
+        log_debug( "finish_lookup: checking key %08lX (%s)(req_usage=%x)\n",
+                   (ulong)keyid_from_pk( keyblock->pkt->pkt.public_key, NULL),
+                   foundk? "one":"all", req_usage);
+
+    if (!req_usage) {
+        latest_key = foundk? foundk:keyblock;
+        goto found;
+    }
+    
+    if (!req_usage) {
+        ctx->found_key = foundk;
+        cache_user_id( keyblock );
+        return 1; /* found */
+    }
+    
+    latest_date = 0;
+    latest_key  = NULL;
+    if ( !foundk || foundk->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
+        KBNODE nextk;
+        /* either start a loop or check just this one subkey */
+        for (k=foundk?foundk:keyblock; k; k = nextk ) {
+            PKT_public_key *pk;
+            nextk = k->next;
+            if ( k->pkt->pkttype != PKT_PUBLIC_SUBKEY )
+                continue;
+            if ( foundk )
+                nextk = NULL;  /* what a hack */
+            pk = k->pkt->pkt.public_key;
+            if (DBG_CACHE)
+                log_debug( "\tchecking subkey %08lX\n",
+                           (ulong)keyid_from_pk( pk, NULL));
+            if ( !pk->is_valid ) {
+                if (DBG_CACHE)
+                    log_debug( "\tsubkey not valid\n");
+                continue;
+            }
+            if ( pk->is_revoked ) {
+                if (DBG_CACHE)
+                    log_debug( "\tsubkey has been revoked\n");
+                continue;
+            }
+            if ( pk->has_expired ) {
+                if (DBG_CACHE)
+                    log_debug( "\tsubkey has expired\n");
+                continue;
+            }
+            
+            if ( !((pk->pubkey_usage&USAGE_MASK) & req_usage) ) {
+                if (DBG_CACHE)
+                    log_debug( "\tusage does not match: want=%x have=%x\n",
+                               req_usage, pk->pubkey_usage );
+                continue;
+            }
 
-static void
-finish_lookup_sk( KBNODE keyblock, PKT_secret_key *sk, KBNODE k, int primary )
-{
-    assert(    k->pkt->pkttype == PKT_SECRET_KEY
-	    || k->pkt->pkttype == PKT_SECRET_SUBKEY );
-    assert( keyblock->pkt->pkttype == PKT_SECRET_KEY );
-    if( primary && !sk->pubkey_usage ) {
-	copy_secret_key( sk, keyblock->pkt->pkt.secret_key );
+            if (DBG_CACHE)
+                log_debug( "\tsubkey looks fine\n");
+            if ( pk->created > latest_date ) {
+                latest_date = pk->created;
+                latest_key  = k;
+            }
+        }
     }
-    else {
-	if( primary && sk->pubkey_usage
-	    && check_pubkey_algo2( k->pkt->pkt.secret_key->pubkey_algo,
-		       sk->pubkey_usage ) == G10ERR_WR_PUBKEY_ALGO ) {
-	    /* if the usage is not correct, try to use a subkey */
-	    KBNODE save_k = k;
-
-	    k = NULL;
-	    /* kludge for pgp 5: which doesn't accept type 20:
-	     * try to use a type 16 subkey instead */
-	    if( sk->pubkey_usage == PUBKEY_USAGE_ENC ) {
-		for( k = save_k; k; k = k->next ) {
-		    if( k->pkt->pkttype == PKT_SECRET_SUBKEY
-			&& k->pkt->pkt.secret_key->pubkey_algo
-			    == PUBKEY_ALGO_ELGAMAL_E
-			&& !check_pubkey_algo2(
-				k->pkt->pkt.secret_key->pubkey_algo,
-						 sk->pubkey_usage ) )
-			break;
-		}
-	    }
-
-	    if( !k ) {
-		for(k = save_k ; k; k = k->next ) {
-		    if( k->pkt->pkttype == PKT_SECRET_SUBKEY
-			&& !check_pubkey_algo2(
-				k->pkt->pkt.secret_key->pubkey_algo,
-						 sk->pubkey_usage ) )
-			break;
-		}
-	    }
-	    if( !k )
-		k = save_k;
-	    else
-		log_info(_("using secondary key %08lX "
-			   "instead of primary key %08lX\n"),
-		      (ulong)keyid_from_sk( k->pkt->pkt.secret_key, NULL),
-		      (ulong)keyid_from_sk( save_k->pkt->pkt.secret_key, NULL)
-			);
-	}
 
-	copy_secret_key( sk, k->pkt->pkt.secret_key );
-    }
+    /* Okay now try the primary key unless we have want an exact 
+     * key ID match on a subkey */
+    if ( !latest_key && !(ctx->exact && foundk != keyblock) ) {
+        PKT_public_key *pk;
+        if (DBG_CACHE && !foundk )
+            log_debug( "\tno suitable subkeys found - trying primary\n");
+        pk = keyblock->pkt->pkt.public_key;
+        if ( !pk->is_valid ) {
+            if (DBG_CACHE)
+                log_debug( "\tprimary key not valid\n");
+        }
+        else if ( pk->is_revoked ) {
+            if (DBG_CACHE)
+                log_debug( "\tprimary key has been revoked\n");
+        }
+        else if ( pk->has_expired ) {
+            if (DBG_CACHE)
+                log_debug( "\tprimary key has expired\n");
+        }
+        else  if ( !((pk->pubkey_usage&USAGE_MASK) & req_usage) ) {
+            if (DBG_CACHE)
+                log_debug( "\tprimary key usage does not match: "
+                           "want=%x have=%x\n",
+                           req_usage, pk->pubkey_usage );
+        }
+        else { /* okay */
+            if (DBG_CACHE)
+                log_debug( "\tprimary key may be used\n");
+            latest_key = keyblock;
+            latest_date = pk->created;
+        }
+    }
+    
+    if ( !latest_key ) {
+        if (DBG_CACHE)
+            log_debug("\tno suitable key found -  giving up\n");
+        return 0;
+    }
+
+ found:
+    if (DBG_CACHE)
+        log_debug( "\tusing key %08lX\n",
+                (ulong)keyid_from_pk( latest_key->pkt->pkt.public_key, NULL) );
+
+    ctx->found_key = latest_key;
+
+    if (latest_key != keyblock && opt.verbose) {
+        log_info(_("using secondary key %08lX "
+                   "instead of primary key %08lX\n"),
+                 (ulong)keyid_from_pk( latest_key->pkt->pkt.public_key, NULL),
+                 (ulong)keyid_from_pk( keyblock->pkt->pkt.public_key, NULL) );
+    }
+
+    cache_user_id( keyblock );
+    
+    return 1; /* found */
 }
 
-
+ 
 static int
-lookup_pk( GETKEY_CTX ctx, PKT_public_key *pk, KBNODE *ret_keyblock )
+lookup( GETKEY_CTX ctx, KBNODE *ret_keyblock, int secmode )
 {
     int rc;
-    KBNODE k;
     int oldmode = set_packet_list_mode(0);
     byte namehash[20];
     int use_namehash=0;
+    KBNODE secblock = NULL; /* helper */
+    int no_suitable_key = 0;
 
     if( !ctx->count ) /* first time */
-	rc = enum_keyblocks( 0, &ctx->kbpos, &ctx->keyblock );
+	rc = enum_keyblocks( secmode? 5:0, &ctx->kbpos, NULL );
     else
 	rc = 0;
     if( !rc ) {
 	while( !(rc = enum_keyblocks( 1, &ctx->kbpos, &ctx->keyblock )) ) {
 	    int n;
 	    getkey_item_t *item;
-	    /* fixme: we don't enum the complete keyblock, but
-	     * use the first match and then continue with the next keyblock
-	     */
+
+            if ( secmode ) {
+                /* find the correspondig public key and use this 
+                 * this one for the selection process */
+                u32 aki[2];
+                KBNODE k = ctx->keyblock;
+                
+                if ( k->pkt->pkttype != PKT_SECRET_KEY )
+                    BUG();
+                keyid_from_sk( k->pkt->pkt.secret_key, aki );
+	        k = get_pubkeyblock( aki );
+	        if( !k ) {
+	            log_info(_("key %08lX: secret key without public key "
+                               "- skipped\n"),  (ulong)aki[1] );
+                    goto skip;
+                }
+                secblock = ctx->keyblock;
+                ctx->keyblock = k;
+                premerge_public_with_secret ( ctx->keyblock, secblock );
+            }
+
+
 	    /* loop over all the user ids we want to look for */
 	    item = ctx->items;
 	    for(n=0; n < ctx->nitems; n++, item++ ) {
-		if( item->mode < 10 )
-		    k = find_by_name( ctx->keyblock, pk,
-				      item->name, item->mode,
-				      namehash, &use_namehash );
-		else if( item->mode >= 10 && item->mode <= 12 )
-		    k = find_by_keyid( ctx->keyblock, pk,
+                KBNODE k = NULL;
+                int found = 0;
+    
+		if( item->mode < 10 ) {
+		    found = find_by_name( ctx->keyblock,
+                                          item->name, item->mode,
+                                          namehash );
+                    use_namehash = found;
+                }
+		else if( item->mode >= 10 && item->mode <= 12 ) {
+		    k = find_by_keyid( ctx->keyblock, 
 				       item->keyid, item->mode );
-		else if( item->mode == 15 )
-		    k = find_first( ctx->keyblock, pk );
-		else if( item->mode == 16 || item->mode == 20 )
-		    k = find_by_fpr( ctx->keyblock, pk,
+                    found = !!k;
+                }
+		else if( item->mode == 15 ) {
+		    found = 1;
+                }
+		else if( item->mode == 16 || item->mode == 20
+                         || item->mode == 21 ) {
+		    k = find_by_fpr( ctx->keyblock,
 				     item->fprint, item->mode );
+                    found = !!k;
+                }
 		else
 		    BUG();
-		if( k ) {
-		    finish_lookup( ctx->keyblock, pk, k, namehash,
-						 use_namehash, ctx->primary );
-		    goto found;
+		if( found ) { 
+                    /* this keyblock looks fine - do further investigation */
+                    merge_selfsigs ( ctx->keyblock );
+		    if ( finish_lookup( ctx, k ) ) {
+                        no_suitable_key = 0;
+                        if ( secmode ) {
+                            merge_public_with_secret ( ctx->keyblock,
+                                                       secblock);
+                            release_kbnode (secblock);
+                            secblock = NULL;
+                        }
+                        goto found;
+                    }
+                    else
+                        no_suitable_key = 1;
 		}
 	    }
+          skip:
+            /* release resources and try the next keyblock */
+            if ( secmode ) {
+                release_kbnode( secblock );
+                secblock = NULL;
+            }
 	    release_kbnode( ctx->keyblock );
 	    ctx->keyblock = NULL;
 	}
-      found: ;
+      found:
+        ;
     }
     if( rc && rc != -1 )
 	log_error("enum_keyblocks failed: %s\n", g10_errstr(rc));
 
     if( !rc ) {
-	if( ret_keyblock ) {
-	    *ret_keyblock = ctx->keyblock;
-	    ctx->keyblock = NULL;
-	}
+        *ret_keyblock = ctx->keyblock; /* return the keyblock */
+        ctx->keyblock = NULL;
     }
+    else if (rc == -1 && no_suitable_key)
+        rc = secmode ? G10ERR_UNU_SECKEY : G10ERR_UNU_PUBKEY;
     else if( rc == -1 )
-	rc = G10ERR_NO_PUBKEY;
+	rc = secmode ? G10ERR_NO_SECKEY : G10ERR_NO_PUBKEY;
 
+    if ( secmode ) {
+        release_kbnode( secblock );
+        secblock = NULL;
+    }
     release_kbnode( ctx->keyblock );
     ctx->keyblock = NULL;
     set_packet_list_mode(oldmode);
@@ -1816,7 +2345,7 @@
 	lkup_stats[ctx->mode].any = 1;
 	if( !rc )
 	    lkup_stats[ctx->mode].okay_count++;
-	else if ( rc == G10ERR_NO_PUBKEY )
+	else if ( rc == G10ERR_NO_PUBKEY || rc == G10ERR_NO_SECKEY )
 	    lkup_stats[ctx->mode].nokey_count++;
 	else
 	    lkup_stats[ctx->mode].error_count++;
@@ -1830,75 +2359,13 @@
 
 
 
-static int
-lookup_sk( GETKEY_CTX ctx, PKT_secret_key *sk, KBNODE *ret_keyblock )
-{
-    int rc;
-    KBNODE k;
-    int oldmode = set_packet_list_mode(0);
-
-    if( !ctx->count ) /* first time */
-	rc = enum_keyblocks( 5, &ctx->kbpos, &ctx->keyblock );
-    else
-	rc = 0;
-    if( !rc ) {
-	while( !(rc = enum_keyblocks( 1, &ctx->kbpos, &ctx->keyblock )) ) {
-	    int n;
-	    getkey_item_t *item;
-	    /* fixme: we don't enum the complete keyblock, but
-	     * use the first match and then continue with the next keyblock
-	     */
-	    /* loop over all the user ids we want to look for */
-	    item = ctx->items;
-	    for(n=0; n < ctx->nitems; n++, item++ ) {
-		if( item->mode < 10 )
-		    k = find_by_name_sk( ctx->keyblock, sk,
-					 item->name, item->mode );
-		else if( item->mode >= 10 && item->mode <= 12 )
-		    k = find_by_keyid_sk( ctx->keyblock, sk,
-					  item->keyid, item->mode );
-		else if( item->mode == 15 )
-		    k = find_first_sk( ctx->keyblock, sk );
-		else if( item->mode == 16 || item->mode == 20 )
-		    k = find_by_fpr_sk( ctx->keyblock, sk,
-					item->fprint, item->mode );
-		else
-		    BUG();
-		if( k ) {
-		    finish_lookup_sk( ctx->keyblock, sk, k, ctx->primary );
-		    goto found;
-		}
-	    }
-	    release_kbnode( ctx->keyblock );
-	    ctx->keyblock = NULL;
-	}
-      found: ;
-    }
-    if( rc && rc != -1 )
-	log_error("enum_keyblocks failed: %s\n", g10_errstr(rc));
-
-    if( !rc ) {
-	if( ret_keyblock ) {
-	    *ret_keyblock = ctx->keyblock;
-	    ctx->keyblock = NULL;
-	}
-    }
-    else if( rc == -1 )
-	rc = G10ERR_NO_SECKEY;
-
-    release_kbnode( ctx->keyblock );
-    ctx->keyblock = NULL;
-    set_packet_list_mode(oldmode);
-
-    ctx->last_rc = rc;
-    ctx->count++;
-    return rc;
-}
-
-
 
 /****************
- * fixme: replace by the generic function
+ * FIXME: Replace by the generic function 
+ *        It does not work as it is right now - it is used at 
+ *        2 places:  a) to get the key for an anonyous recipient
+ *                   b) to get the ultimately trusted keys.
+ *        The a) usage might have some problems.
  *
  * Enumerate all primary secret keys.  Caller must use these procedure:
  *  1) create a void pointer and initialize it to NULL
@@ -1973,6 +2440,11 @@
 }
 
 
+
+/*********************************************
+ ***********  user ID printing helpers *******
+ *********************************************/
+
 /****************
  * Return a string with a printable representation of the user_id.
  * this string must be freed by m_free.
@@ -1985,12 +2457,17 @@
     int pass=0;
     /* try it two times; second pass reads from key resources */
     do {
-	for(r=user_id_db; r; r = r->next )
-	    if( r->keyid[0] == keyid[0] && r->keyid[1] == keyid[1] ) {
-		p = m_alloc( r->len + 10 );
-		sprintf(p, "%08lX %.*s", (ulong)keyid[1], r->len, r->name );
-		return p;
-	    }
+	for(r=user_id_db; r; r = r->next ) {
+            keyid_list_t a;
+            for (a=r->keyids; a; a= a->next ) {
+                if( a->keyid[0] == keyid[0] && a->keyid[1] == keyid[1] ) {
+                    p = m_alloc( r->len + 10 );
+                    sprintf(p, "%08lX %.*s",
+                            (ulong)keyid[1], r->len, r->name );
+                    return p;
+                }
+            }
+        }
     } while( ++pass < 2 && !get_pubkey( NULL, keyid ) );
     p = m_alloc( 15 );
     sprintf(p, "%08lX [?]", (ulong)keyid[1] );
@@ -2017,13 +2494,18 @@
     int pass=0;
     /* try it two times; second pass reads from key resources */
     do {
-	for(r=user_id_db; r; r = r->next )
-	    if( r->keyid[0] == keyid[0] && r->keyid[1] == keyid[1] ) {
-		p = m_alloc( r->len + 20 );
-		sprintf(p, "%08lX%08lX %.*s",
-			  (ulong)keyid[0], (ulong)keyid[1], r->len, r->name );
-		return p;
-	    }
+	for(r=user_id_db; r; r = r->next ) {
+            keyid_list_t a;
+            for (a=r->keyids; a; a= a->next ) {
+                if( a->keyid[0] == keyid[0] && a->keyid[1] == keyid[1] ) {
+                    p = m_alloc( r->len + 20 );
+                    sprintf(p, "%08lX%08lX %.*s",
+                            (ulong)keyid[0], (ulong)keyid[1],
+                            r->len, r->name );
+                    return p;
+                }
+            }
+        }
     } while( ++pass < 2 && !get_pubkey( NULL, keyid ) );
     p = m_alloc( 25 );
     sprintf(p, "%08lX%08lX [?]", (ulong)keyid[0], (ulong)keyid[1] );
@@ -2039,13 +2521,17 @@
 
     /* try it two times; second pass reads from key resources */
     do {
-	for(r=user_id_db; r; r = r->next )
-	    if( r->keyid[0] == keyid[0] && r->keyid[1] == keyid[1] ) {
-		p = m_alloc( r->len );
-		memcpy(p, r->name, r->len );
-		*rn = r->len;
-		return p;
-	    }
+	for(r=user_id_db; r; r = r->next ) {
+            keyid_list_t a;
+            for (a=r->keyids; a; a= a->next ) {
+                if( a->keyid[0] == keyid[0] && a->keyid[1] == keyid[1] ) {
+                    p = m_alloc( r->len );
+                    memcpy(p, r->name, r->len );
+                    *rn = r->len;
+                    return p;
+                }
+            }
+        }
     } while( ++pass < 2 && !get_pubkey( NULL, keyid ) );
     p = m_strdup( _("[User id not found]") );
     *rn = strlen(p);
diff -urN gnupg-1.0.4/g10/gpgv.c gnupg-1.0.5/g10/gpgv.c
--- gnupg-1.0.4/g10/gpgv.c	Sat Oct  7 13:15:02 2000
+++ gnupg-1.0.5/g10/gpgv.c	Thu Mar  8 15:03:40 2001
@@ -1,5 +1,5 @@
 /* gpgv.c - The GnuPG signature verify utility
- *	Copyright (C) 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -358,6 +358,7 @@
 DOTLOCK create_dotlock( const char *file_to_lock ) { return NULL; }
 int make_dotlock( DOTLOCK h, long timeout ) { return 0;}
 int release_dotlock( DOTLOCK h ) {return 0;}
+void remove_lockfiles(void) {}
 
 
 
diff -urN gnupg-1.0.4/g10/helptext.c gnupg-1.0.5/g10/helptext.c
--- gnupg-1.0.4/g10/helptext.c	Wed Jul 12 11:31:54 2000
+++ gnupg-1.0.5/g10/helptext.c	Thu Mar  8 15:03:48 2001
@@ -1,5 +1,5 @@
 /* helptext.c  - English help texts
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/g10/hkp.c gnupg-1.0.5/g10/hkp.c
--- gnupg-1.0.4/g10/hkp.c	Mon Oct 16 17:43:41 2000
+++ gnupg-1.0.5/g10/hkp.c	Mon Apr 23 13:38:56 2001
@@ -1,5 +1,5 @@
 /* hkp.c  -  Horrowitz Keyserver Protocol
- *	Copyright (C) 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -38,15 +38,6 @@
 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 is 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.
@@ -58,10 +49,6 @@
 int
 hkp_ask_import( u32 *keyid )
 {
-  #ifdef HAVE_DOSISH_SYSTEM
-    not_implemented();
-    return -1;
-  #else
     struct http_context hd;
     char *request;
     int rc;
@@ -78,8 +65,19 @@
      * down to the import function.  Marc told that there is such a
      * binary mode ... how?
      */
-    sprintf( request, "x-hkp://%s:11371/pks/lookup?op=get&search=0x%08lX",
+    if ( !strncmp (opt.keyserver_name, "x-broken-hkp://", 15) ) {
+        sprintf( request, "x-hkp://%s/pks/lookup?op=get&search=0x%08lX",
+			opt.keyserver_name+15, (ulong)keyid[1] );
+        hflags |= HTTP_FLAG_NO_SHUTDOWN;
+    }
+    else if ( !strncmp (opt.keyserver_name, "x-hkp://", 8) ) {
+        sprintf( request, "%s/pks/lookup?op=get&search=0x%08lX",
 			opt.keyserver_name, (ulong)keyid[1] );
+    }
+    else {
+        sprintf( request, "x-hkp://%s:11371/pks/lookup?op=get&search=0x%08lX",
+			opt.keyserver_name, (ulong)keyid[1] );
+    }
     rc = http_open_document( &hd, request, hflags );
     if( rc ) {
 	log_info(_("can't get key from keyserver: %s\n"),
@@ -93,7 +91,6 @@
 
     m_free( request );
     return rc;
-  #endif
 }
 
 
@@ -101,10 +98,6 @@
 int
 hkp_import( STRLIST users )
 {
-  #ifdef HAVE_DOSISH_SYSTEM
-    not_implemented();
-    return -1;
-  #else
     if( !opt.keyserver_name ) {
 	log_error(_("no keyserver known (use option --keyserver)\n"));
 	return -1;
@@ -125,17 +118,12 @@
 	    log_inc_errorcount();
     }
     return 0;
-  #endif
 }
 
 
 int
 hkp_export( STRLIST users )
 {
-  #ifdef HAVE_DOSISH_SYSTEM
-    not_implemented();
-    return -1;
-  #else
     int rc;
     armor_filter_context_t afx;
     IOBUF temp = iobuf_temp();
@@ -164,7 +152,16 @@
     iobuf_flush_temp( temp );
 
     request = m_alloc( strlen( opt.keyserver_name ) + 100 );
-    sprintf( request, "x-hkp://%s:11371/pks/add", opt.keyserver_name );
+    if ( !strncmp (opt.keyserver_name, "x-broken-hkp://", 15) ) {
+        sprintf( request, "x-hkp://%s/pks/add", opt.keyserver_name+15 );
+        hflags |= HTTP_FLAG_NO_SHUTDOWN;
+    }
+    else if ( !strncmp (opt.keyserver_name, "x-hkp://", 8) ) {
+        sprintf( request, "%s/pks/add", opt.keyserver_name );
+    }
+    else {
+        sprintf( request, "x-hkp://%s:11371/pks/add", opt.keyserver_name );
+    }
     rc = http_open( &hd, HTTP_REQ_POST, request , hflags );
     if( rc ) {
 	log_error(_("can't connect to `%s': %s\n"),
@@ -211,7 +208,6 @@
     }
     http_close( &hd );
     return rc;
-  #endif
 }
 
 static int
diff -urN gnupg-1.0.4/g10/hkp.h gnupg-1.0.5/g10/hkp.h
--- gnupg-1.0.4/g10/hkp.h	Tue May  9 09:04:14 2000
+++ gnupg-1.0.5/g10/hkp.h	Thu Mar  8 15:04:23 2001
@@ -1,5 +1,5 @@
-/* hkp.h  -  Horrowitz Keyserver Protocol
- *	Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+/* hkp.h  -  Horowitz Keyserver Protocol
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/g10/import.c gnupg-1.0.5/g10/import.c
--- gnupg-1.0.4/g10/import.c	Thu Jul 27 17:31:09 2000
+++ gnupg-1.0.5/g10/import.c	Thu Mar  8 15:04:34 2001
@@ -1,5 +1,5 @@
 /* import.c
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -54,11 +54,12 @@
 } stats;
 
 
-static int import( IOBUF inp, int fast, const char* fname );
+static int import( IOBUF inp, int fast, const char* fname, int allow_secret );
 static void print_stats(void);
 static int read_block( IOBUF a, PACKET **pending_pkt, KBNODE *ret_root );
+static void remove_bad_stuff (KBNODE keyblock);
 static int import_one( const char *fname, KBNODE keyblock, int fast );
-static int import_secret_one( const char *fname, KBNODE keyblock );
+static int import_secret_one( const char *fname, KBNODE keyblock, int allow );
 static int import_revoke_cert( const char *fname, KBNODE node );
 static int chk_self_sigs( const char *fname, KBNODE keyblock,
 			  PKT_public_key *pk, u32 *keyid );
@@ -127,7 +128,7 @@
 	if( !inp )
 	    log_error(_("can't open `%s': %s\n"), fname, strerror(errno) );
 	else {
-	    int rc = import( inp, fast, fname );
+	    int rc = import( inp, fast, fname, opt.allow_secret_key_import );
 	    iobuf_close(inp);
 	    if( rc )
 		log_error("import from `%s' failed: %s\n", fname,
@@ -148,7 +149,7 @@
 
     /* fixme: don't use static variables */
     memset( &stats, 0, sizeof( stats ) );
-    rc = import( inp, fast, "[stream]" );
+    rc = import( inp, fast, "[stream]", opt.allow_secret_key_import );
     print_stats();
     if( !fast )
 	sync_trustdb();
@@ -156,7 +157,7 @@
 }
 
 static int
-import( IOBUF inp, int fast, const char* fname )
+import( IOBUF inp, int fast, const char* fname, int allow_secret )
 {
     PACKET *pending_pkt = NULL;
     KBNODE keyblock;
@@ -171,10 +172,11 @@
     }
 
     while( !(rc = read_block( inp, &pending_pkt, &keyblock) )) {
+        remove_bad_stuff (keyblock);
 	if( keyblock->pkt->pkttype == PKT_PUBLIC_KEY )
 	    rc = import_one( fname, keyblock, fast );
-	else if( keyblock->pkt->pkttype == PKT_SECRET_KEY )
-	    rc = import_secret_one( fname, keyblock );
+	else if( keyblock->pkt->pkttype == PKT_SECRET_KEY ) 
+                rc = import_secret_one( fname, keyblock, allow_secret );
 	else if( keyblock->pkt->pkttype == PKT_SIGNATURE
 		 && keyblock->pkt->pkt.signature->sig_class == 0x20 )
 	    rc = import_revoke_cert( fname, keyblock );
@@ -349,6 +351,21 @@
 }
 
 
+static void
+remove_bad_stuff (KBNODE keyblock)
+{
+    KBNODE node;
+
+    for (node=keyblock; node; node = node->next ) {
+        if( node->pkt->pkttype == PKT_SIGNATURE ) {
+            /* delete the subpackets we use for the verification cache */
+            delete_sig_subpkt (node->pkt->pkt.signature->unhashed_data,
+                               SIGSUBPKT_PRIV_VERIFY_CACHE);
+        }
+    }
+}
+
+
 /****************
  * Try to import one keyblock.	Return an error only in serious cases, but
  * never for an invalid keyblock.  It uses log_error to increase the
@@ -414,7 +431,7 @@
     /* do we have this key already in one of our pubrings ? */
     pk_orig = m_alloc_clear( sizeof *pk_orig );
     rc = get_pubkey( pk_orig, keyid );
-    if( rc && rc != G10ERR_NO_PUBKEY ) {
+    if( rc && rc != G10ERR_NO_PUBKEY && rc != G10ERR_UNU_PUBKEY ) {
 	log_error( _("key %08lX: public key not found: %s\n"),
 				(ulong)keyid[1], g10_errstr(rc));
     }
@@ -556,9 +573,12 @@
 
 /****************
  * Ditto for secret keys.  Handling is simpler than for public keys.
+ * We allow secret key importing only when allow is true, this is so
+ * that a secret key can not be imported accidently and thereby tampering
+ * with the trust calculation.
  */
 static int
-import_secret_one( const char *fname, KBNODE keyblock )
+import_secret_one( const char *fname, KBNODE keyblock, int allow )
 {
     PKT_secret_key *sk;
     KBNODE node, uidnode;
@@ -586,6 +606,13 @@
 	putc('\n', stderr);
     }
     stats.secret_read++;
+    if (!allow) {
+        log_info ( _("secret key %08lX not imported "
+                    "(use %s to allow for it)\n"),
+                   (ulong)keyid[1], "--allow-secret-key-import");
+        return 0;
+    }
+
     if( !uidnode ) {
 	log_error( _("key %08lX: no user ID\n"), (ulong)keyid[1]);
 	return 0;
@@ -1057,6 +1084,7 @@
 		KBNODE n2 = clone_kbnode(node);
 		insert_kbnode( keyblock_orig, n2, 0 );
 		n2->flag |= 1;
+                ++*n_sigs;
 		log_info( _("key %08lX: revocation certificate added\n"),
 					 (ulong)keyid[1]);
 	    }
diff -urN gnupg-1.0.4/g10/kbnode.c gnupg-1.0.5/g10/kbnode.c
--- gnupg-1.0.4/g10/kbnode.c	Tue May  9 09:00:08 2000
+++ gnupg-1.0.5/g10/kbnode.c	Thu Apr  5 13:48:11 2001
@@ -1,5 +1,5 @@
 /* kbnode.c -  keyblock node utility functions
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -355,6 +355,7 @@
 	  case PKT_PLAINTEXT:	s="plaintext"; break;
 	  case PKT_COMPRESSED:	s="compressed"; break;
 	  case PKT_ENCRYPTED:	s="encrypted"; break;
+          case PKT_GPG_CONTROL: s="gpg-control"; break;
 	  default:		s="unknown"; break;
 	}
 	fprintf(stderr, "node %p %02x/%02x type=%s",
@@ -370,6 +371,11 @@
 		   node->pkt->pkt.signature->sig_class,
 		   (ulong)node->pkt->pkt.signature->keyid[1] );
 	}
+	else if( node->pkt->pkttype == PKT_GPG_CONTROL ) {
+	    fprintf(stderr, " ctrl=%d len=%u\n",
+                    node->pkt->pkt.gpg_control->control,
+                    (unsigned int)node->pkt->pkt.gpg_control->datalen);
+	}
 	else if( node->pkt->pkttype == PKT_PUBLIC_KEY
 		 || node->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
 	    fprintf(stderr, "  keyid=%08lX\n", (ulong)
@@ -379,4 +385,3 @@
 	    fputs("\n", stderr);
     }
 }
-
diff -urN gnupg-1.0.4/g10/keydb.h gnupg-1.0.5/g10/keydb.h
--- gnupg-1.0.4/g10/keydb.h	Tue May  9 09:04:21 2000
+++ gnupg-1.0.5/g10/keydb.h	Thu Apr 19 11:31:09 2001
@@ -1,5 +1,5 @@
 /* keydb.h - Key database
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -31,6 +31,14 @@
 
 #define MAX_FINGERPRINT_LEN 20
 
+#define IS_KEY_SIG(s)    ((s)->sig_class == 0x1f)
+#define IS_UID_SIG(s)    (((s)->sig_class & ~3) == 0x10)
+#define IS_SUBKEY_SIG(s) ((s)->sig_class == 0x18)
+#define IS_KEY_REV(s)    ((s)->sig_class == 0x20)
+#define IS_UID_REV(s)    ((s)->sig_class == 0x30)
+#define IS_SUBKEY_REV(s) ((s)->sig_class == 0x28)
+
+
 struct getkey_ctx_s;
 typedef struct getkey_ctx_s *GETKEY_CTX;
 
@@ -69,7 +77,7 @@
 struct keyblock_pos_struct {
     int   resno;     /* resource number */
     enum resource_type rt;
-    ulong offset;    /* position information */
+    off_t offset;    /* position information */
     unsigned count;  /* length of the keyblock in packets */
     IOBUF  fp;	     /* used by enum_keyblocks */
     int secret;      /* working on a secret keyring */
@@ -125,6 +133,7 @@
 /*-- passphrase.h --*/
 int  have_static_passphrase(void);
 void read_passphrase_from_fd( int fd );
+void passphrase_clear_cache ( u32 *keyid, int algo );
 DEK *passphrase_to_dek( u32 *keyid, int pubkey_algo,
 			int cipher_algo, STRING2KEY *s2k, int mode);
 void set_next_passphrase( const char *s );
@@ -133,6 +142,7 @@
 /*-- getkey.c --*/
 int classify_user_id( const char *name, u32 *keyid, byte *fprint,
 		      const char **retstr, size_t *retlen );
+void cache_public_key( PKT_public_key *pk );
 void getkey_disable_caches(void);
 int get_pubkey( PKT_public_key *pk, u32 *keyid );
 KBNODE get_pubkeyblock( u32 *keyid );
@@ -175,6 +185,12 @@
 const char *datestr_from_sig( PKT_signature *sig );
 const char *expirestr_from_pk( PKT_public_key *pk );
 const char *expirestr_from_sk( PKT_secret_key *sk );
+
+const char *colon_strtime (u32 t);
+const char *colon_datestr_from_pk (PKT_public_key *pk);
+const char *colon_datestr_from_sk (PKT_secret_key *sk);
+const char *colon_datestr_from_sig (PKT_signature *sig);
+
 byte *fingerprint_from_sk( PKT_secret_key *sk, byte *buf, size_t *ret_len );
 byte *fingerprint_from_pk( PKT_public_key *pk, byte *buf, size_t *ret_len );
 
diff -urN gnupg-1.0.4/g10/keyedit.c gnupg-1.0.5/g10/keyedit.c
--- gnupg-1.0.4/g10/keyedit.c	Fri Oct 13 12:04:45 2000
+++ gnupg-1.0.5/g10/keyedit.c	Wed Apr 25 11:56:49 2001
@@ -1,5 +1,5 @@
 /* keyedit.c - keyedit stuff
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -40,7 +40,7 @@
 #include "status.h"
 #include "i18n.h"
 
-static void show_prefs( KBNODE keyblock, PKT_user_id *uid );
+static void show_prefs( KBNODE keyblock, PKT_user_id *uid, int verbose );
 static void show_key_with_all_names( KBNODE keyblock,
 	    int only_marked, int with_fpr, int with_subkeys, int with_prefs );
 static void show_key_and_fingerprint( KBNODE keyblock );
@@ -100,7 +100,7 @@
     if( rc )
 	log_error("%s: keyblock read problem: %s\n", username, g10_errstr(rc));
     else
-	merge_keys_and_selfsig( *keyblock );
+	merge_keys_and_selfsig( *keyblock ); 
 
     return rc;
 }
@@ -131,6 +131,7 @@
 	    ++*inv_sigs;
 	break;
       case G10ERR_NO_PUBKEY:
+      case G10ERR_UNU_PUBKEY:
 	node->flag = NODFLG_NOKEY;
 	sigrc = '?';
 	if( no_key )
@@ -568,7 +569,7 @@
 	   cmdLSIGN, cmdREVSIG, cmdREVKEY, cmdDELSIG,
 	   cmdDEBUG, cmdSAVE, cmdADDUID, cmdDELUID, cmdADDKEY, cmdDELKEY,
 	   cmdTOGGLE, cmdSELKEY, cmdPASSWD, cmdTRUST, cmdPREF, cmdEXPIRE,
-	   cmdENABLEKEY, cmdDISABLEKEY,
+           cmdENABLEKEY, cmdDISABLEKEY,  cmdSHOWPREF,
 	   cmdINVCMD, cmdNOP };
     static struct { const char *name;
 		    enum cmdids id;
@@ -603,6 +604,7 @@
 						   "and public key listing") },
 	{ N_("t"     )  , cmdTOGGLE    , 1,0,0, NULL },
 	{ N_("pref")    , cmdPREF      , 0,1,0, N_("list preferences") },
+	{ N_("showpref"), cmdSHOWPREF  , 0,1,0, N_("list preferences") },
 	{ N_("passwd")  , cmdPASSWD    , 1,1,0, N_("change the passphrase") },
 	{ N_("trust")   , cmdTRUST     , 0,1,0, N_("change the ownertrust") },
 	{ N_("revsig")  , cmdREVSIG    , 0,1,0, N_("revoke signatures") },
@@ -695,7 +697,7 @@
 		    have_commands = 0;
 	    }
 	    if( !have_commands ) {
-		answer = cpr_get("keyedit.prompt", _("Command> "));
+		answer = cpr_get_no_help("keyedit.prompt", _("Command> "));
 		cpr_kill_prompt();
 	    }
 	    trim_spaces(answer);
@@ -931,6 +933,10 @@
 	    show_key_with_all_names( keyblock, 0, 0, 0, 1 );
 	    break;
 
+	  case cmdSHOWPREF:
+	    show_key_with_all_names( keyblock, 0, 0, 0, 2 );
+	    break;
+
 	  case cmdNOP:
 	    break;
 
@@ -1014,7 +1020,7 @@
  * show preferences of a public keyblock.
  */
 static void
-show_prefs( KBNODE keyblock, PKT_user_id *uid )
+show_prefs( KBNODE keyblock, PKT_user_id *uid, int verbose )
 {
     KBNODE node = find_kbnode( keyblock, PKT_PUBLIC_KEY );
     PKT_public_key *pk;
@@ -1040,14 +1046,58 @@
     if( !p )
 	return;
 
-    tty_printf("    ");
-    for(i=0; i < n; i+=2 ) {
-	if( p[i] )
-	    tty_printf( " %c%d", p[i] == PREFTYPE_SYM    ? 'S' :
-				 p[i] == PREFTYPE_HASH	 ? 'H' :
-				 p[i] == PREFTYPE_COMPR  ? 'Z' : '?', p[i+1]);
+    if (verbose) {
+        int any, des_seen=0;
+
+        tty_printf ("     Cipher: ");
+        for(i=any=0; i < n; i+=2 ) {
+            if( p[i] == PREFTYPE_SYM ) {
+                const char *s = cipher_algo_to_string (p[i+1]);
+                
+                if (any)
+                    tty_printf (", ");
+                any = 1;
+                /* We don't want to display strings for experimental algos */
+                if (s && p[i+1] < 100 )
+                    tty_printf ("%s", s );
+                else
+                    tty_printf ("[%d]", p[i+1]);
+                if (p[i+1] == CIPHER_ALGO_3DES )
+                    des_seen = 1;
+            }    
+        }
+        if (!des_seen) {
+            if (any)
+                tty_printf (", ");
+            tty_printf ("3DES");
+        }
+        tty_printf ("\n     Hash: ");
+        for(i=any=0; i < n; i+=2 ) {
+            if( p[i] == PREFTYPE_HASH ) {
+                const char *s = digest_algo_to_string (p[i+1]);
+                
+                if (any)
+                    tty_printf (", ");
+                any = 1;
+                /* We don't want to display strings for experimental algos */
+                if (s && p[i+1] < 100 )
+                    tty_printf ("%s", s );
+                else
+                    tty_printf ("[%d]", p[i+1]);
+            }    
+        }
+        tty_printf("\n");
+    }
+    else {
+        tty_printf("    ");
+        for(i=0; i < n; i+=2 ) {
+            if( p[i] )
+                tty_printf( " %c%d", p[i] == PREFTYPE_SYM   ? 'S' :
+                                     p[i] == PREFTYPE_HASH  ? 'H' :
+                                     p[i] == PREFTYPE_COMPR ? 'Z':'?', p[i+1]);
+        }
+        tty_printf("\n");
     }
-    tty_printf("\n");
 
     m_free(p);
 }
@@ -1140,12 +1190,16 @@
 		   tty_printf("     ");
 		else if( node->flag & NODFLG_SELUID )
 		   tty_printf("(%d)* ", i);
+		else if( uid->is_primary )
+		   tty_printf("(%d). ", i);
 		else
 		   tty_printf("(%d)  ", i);
+                if ( uid->is_revoked )
+                    tty_printf ("[revoked] ");
 		tty_print_utf8_string( uid->name, uid->len );
 		tty_printf("\n");
 		if( with_prefs )
-		    show_prefs( keyblock, uid );
+		    show_prefs( keyblock, uid, with_prefs == 2 );
 	    }
 	}
     }
diff -urN gnupg-1.0.4/g10/keygen.c gnupg-1.0.5/g10/keygen.c
--- gnupg-1.0.4/g10/keygen.c	Thu Oct 12 12:23:16 2000
+++ gnupg-1.0.5/g10/keygen.c	Tue Mar 27 12:59:06 2001
@@ -1,5 +1,5 @@
 /* keygen.c - generate a key pair
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -185,6 +185,9 @@
     if( !node )
 	BUG();
     pk = node->pkt->pkt.public_key;
+    /* we have to cache the key, so that the verification of the signature
+     * creation is able to retrieve the public key */
+    cache_public_key (pk);
 
     /* and make the signature */
     rc = make_keysig_packet( &sig, pk, uid, NULL, sk, 0x13, 0,
@@ -218,6 +221,10 @@
     if( !node )
 	BUG();
     pk = node->pkt->pkt.public_key;
+    /* we have to cache the key, so that the verification of the signature
+     * creation is able to retrieve the public key */
+    cache_public_key (pk);
+ 
     /* find the last subkey */
     subpk = NULL;
     for(node=pub_root; node; node = node->next ) {
@@ -416,8 +423,10 @@
 }
 
 #if 0
-/* we can't enable generation right now, becuase we first need to implement
- * the keyflags */
+/* we can't enable generation right now, becuase we first need to
+ * implement the keyflags - the problem is that we need to change all
+ * signature editing function to keep the ketflags associated with an
+ * RSA key.  */
 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 )
@@ -568,7 +577,7 @@
       #endif
 	else if( algo == 4 ) {
 	    if( cpr_get_answer_is_yes("keygen.algo.elg_se",_(
-		"Do you really want to create a sign and encrypt key? "))) {
+		"The use of this algorithm is deprecated - create anyway? "))){
 		algo = PUBKEY_ALGO_ELGAMAL;
 		break;
 	    }
@@ -1269,17 +1278,17 @@
 	    err = "line too long";
 	    break;
 	}
-	for( p = line; isspace(*p); p++ )
+	for( p = line; isspace(*(byte*)p); p++ )
 	    ;
 	if( !*p || *p == '#' )
 	    continue;
 	keyword = p;
 	if( *keyword == '%' ) {
-	    for( ; !isspace(*p); p++ )
+	    for( ; !isspace(*(byte*)p); p++ )
 		;
 	    if( *p )
 		*p++ = 0;
-	    for( ; isspace(*p); p++ )
+	    for( ; isspace(*(byte*)p); p++ )
 		;
 	    value = p;
 	    trim_trailing_ws( value, strlen(value) );
@@ -1325,7 +1334,7 @@
 	}
 	if( *p )
 	    *p++ = 0;
-	for( ; isspace(*p); p++ )
+	for( ; isspace(*(byte*)p); p++ )
 	    ;
 	if( !*p ) {
 	    err = "missing argument";
@@ -1511,6 +1520,7 @@
     PKT_secret_key *sk = NULL;
     const char *s;
     int rc;
+    int did_sub = 0;
 
     if( outctrl->dryrun ) {
 	log_info("dry-run mode - key generation skipped\n");
@@ -1609,6 +1619,7 @@
 	    rc = write_keybinding(pub_root, pub_root, sk);
 	if( !rc )
 	    rc = write_keybinding(sec_root, pub_root, sk);
+        did_sub = 1;
     }
 
 
@@ -1689,6 +1700,9 @@
 	else
 	    tty_printf(_("Key generation failed: %s\n"), g10_errstr(rc) );
     }
+    else {
+        write_status_text (STATUS_KEY_CREATED, did_sub? "B":"P");
+    }
     release_kbnode( pub_root );
     release_kbnode( sec_root );
     if( sk ) /* the unprotected  secret key */
@@ -1783,8 +1797,10 @@
 	rc = write_keybinding(pub_keyblock, pub_keyblock, sk);
     if( !rc )
 	rc = write_keybinding(sec_keyblock, pub_keyblock, sk);
-    if( !rc )
+    if( !rc ) {
 	okay = 1;
+        write_status_text (STATUS_KEY_CREATED, "S");
+    }
 
   leave:
     if( rc )
diff -urN gnupg-1.0.4/g10/keyid.c gnupg-1.0.5/g10/keyid.c
--- gnupg-1.0.4/g10/keyid.c	Fri Jun 30 07:55:19 2000
+++ gnupg-1.0.5/g10/keyid.c	Thu Apr 19 11:49:48 2001
@@ -1,5 +1,5 @@
-/* keyid.c - jeyid and fingerprint handling
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+/* keyid.c - key ID and fingerprint handling
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -260,6 +260,21 @@
     return pubkey_nbits( sk->pubkey_algo, sk->skey );
 }
 
+static const char *
+mk_datestr (char *buffer, time_t atime)
+{
+    struct tm *tp;
+
+    if ( atime < 0 ) /* 32 bit time_t and after 2038-01-19 */
+        strcpy (buffer, "????-??-??"); /* mark this as invalid */
+    else {
+        tp = gmtime (&atime);
+        sprintf (buffer,"%04d-%02d-%02d",
+                 1900+tp->tm_year, tp->tm_mon+1, tp->tm_mday );
+    }
+    return buffer;
+}
+
 /****************
  * return a string with the creation date of the pk
  * Note: this is alloced in a static buffer.
@@ -269,36 +284,27 @@
 datestr_from_pk( PKT_public_key *pk )
 {
     static char buffer[11+5];
-    struct tm *tp;
     time_t atime = pk->timestamp;
 
-    tp = gmtime( &atime );
-    sprintf(buffer,"%04d-%02d-%02d", 1900+tp->tm_year, tp->tm_mon+1, tp->tm_mday );
-    return buffer;
+    return mk_datestr (buffer, atime);
 }
 
 const char *
 datestr_from_sk( PKT_secret_key *sk )
 {
     static char buffer[11+5];
-    struct tm *tp;
     time_t atime = sk->timestamp;
 
-    tp = gmtime( &atime );
-    sprintf(buffer,"%04d-%02d-%02d", 1900+tp->tm_year, tp->tm_mon+1, tp->tm_mday );
-    return buffer;
+    return mk_datestr (buffer, atime);
 }
 
 const char *
 datestr_from_sig( PKT_signature *sig )
 {
     static char buffer[11+5];
-    struct tm *tp;
     time_t atime = sig->timestamp;
 
-    tp = gmtime( &atime );
-    sprintf(buffer,"%04d-%02d-%02d", 1900+tp->tm_year, tp->tm_mon+1, tp->tm_mday );
-    return buffer;
+    return mk_datestr (buffer, atime);
 }
 
 
@@ -306,31 +312,72 @@
 expirestr_from_pk( PKT_public_key *pk )
 {
     static char buffer[11+5];
-    struct tm *tp;
     time_t atime;
 
     if( !pk->expiredate )
 	return _("never     ");
     atime = pk->expiredate;
-    tp = gmtime( &atime );
-    sprintf(buffer,"%04d-%02d-%02d", 1900+tp->tm_year, tp->tm_mon+1, tp->tm_mday );
-    return buffer;
+    return mk_datestr (buffer, atime);
 }
 
 const char *
 expirestr_from_sk( PKT_secret_key *sk )
 {
     static char buffer[11+5];
-    struct tm *tp;
     time_t atime;
 
     if( !sk->expiredate )
 	return "never     ";
     atime = sk->expiredate;
-    tp = gmtime( &atime );
-    sprintf(buffer,"%04d-%02d-%02d", 1900+tp->tm_year, tp->tm_mon+1, tp->tm_mday );
-    return buffer;
+    return mk_datestr (buffer, atime);
 }
+
+const char *
+colon_strtime (u32 t)
+{
+    if (!t)
+        return "";
+    if (opt.fixed_list_mode) {
+        static char buf[15];
+        sprintf (buf, "%lu", (ulong)t);
+        return buf;
+    }
+    return strtimestamp(t);
+}
+
+const char *
+colon_datestr_from_pk (PKT_public_key *pk)
+{
+    if (opt.fixed_list_mode) {
+        static char buf[15];
+        sprintf (buf, "%lu", (ulong)pk->timestamp);
+        return buf;
+    }
+    return datestr_from_pk (pk);
+}
+
+const char *
+colon_datestr_from_sk (PKT_secret_key *sk)
+{
+    if (opt.fixed_list_mode) {
+        static char buf[15];
+        sprintf (buf, "%lu", (ulong)sk->timestamp);
+        return buf;
+    }
+    return datestr_from_sk (sk);
+}
+
+const char *
+colon_datestr_from_sig (PKT_signature *sig)
+{
+    if (opt.fixed_list_mode) {
+        static char buf[15];
+        sprintf (buf, "%lu", (ulong)sig->timestamp);
+        return buf;
+    }
+    return datestr_from_sig (sig);
+}
+
 
 
 /**************** .
diff -urN gnupg-1.0.4/g10/keylist.c gnupg-1.0.5/g10/keylist.c
--- gnupg-1.0.4/g10/keylist.c	Mon Jul 24 10:11:30 2000
+++ gnupg-1.0.5/g10/keylist.c	Sat Apr 28 12:06:06 2001
@@ -1,5 +1,5 @@
 /* keylist.c
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -91,7 +91,7 @@
 		putchar('-');
 	    putchar('\n');
 	}
-	merge_keys_and_selfsig( keyblock );
+        merge_keys_and_selfsig( keyblock );
 	list_keyblock( keyblock, secret );
 	release_kbnode( keyblock ); keyblock = NULL;
     }
@@ -105,85 +105,6 @@
 }
 
 
-/****************
- * 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 )
 {
@@ -199,7 +120,6 @@
 	    return;
 	}
 	do {
-	    merge_keys_and_selfsig( keyblock );
 	    list_keyblock( keyblock, 1 );
 	    release_kbnode( keyblock );
 	} while( !get_seckey_next( ctx, NULL, &keyblock ) );
@@ -213,7 +133,6 @@
 	    return;
 	}
 	do {
-	    merge_keys_and_selfsig( keyblock );
 	    list_keyblock( keyblock, 0 );
 	    release_kbnode( keyblock );
 	} while( !get_pubkey_next( ctx, NULL, &keyblock ) );
@@ -235,9 +154,57 @@
     }
 }
 
+static void
+print_capabilities (PKT_public_key *pk, PKT_secret_key *sk, KBNODE keyblock)
+{
+    unsigned int usage = pk? pk->pubkey_usage : sk->pubkey_usage;
+    
+    if ( usage & PUBKEY_USAGE_ENC ) {
+        putchar ('e');
+    }
+    if ( usage & PUBKEY_USAGE_SIG ) {
+        putchar ('s');
+        putchar ('c');
+    }
+    if ( keyblock ) { /* figure our the usable capabilities */
+        KBNODE k;
+        int enc=0, sign=0, cert=0;
+
+        for (k=keyblock; k; k = k->next ) {
+            if ( k->pkt->pkttype == PKT_PUBLIC_KEY 
+                 || k->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
+                pk = k->pkt->pkt.public_key;
+                if ( pk->is_valid && !pk->is_revoked && !pk->has_expired ) {
+                    if ( pk->pubkey_usage & PUBKEY_USAGE_ENC )
+                        enc = 1;
+                    if ( pk->pubkey_usage & PUBKEY_USAGE_SIG )
+                        sign = cert = 1;
+                }
+            }
+            else if ( k->pkt->pkttype == PKT_SECRET_KEY 
+                      || k->pkt->pkttype == PKT_SECRET_SUBKEY ) {
+                sk = k->pkt->pkt.secret_key;
+                if ( sk->is_valid && !sk->is_revoked && !sk->has_expired ) {
+                    if ( sk->pubkey_usage & PUBKEY_USAGE_ENC )
+                        enc = 1;
+                    if ( sk->pubkey_usage & PUBKEY_USAGE_SIG )
+                        sign = cert = 1;
+                }
+            }
+        }
+        if (enc)
+            putchar ('E');
+        if (sign)
+            putchar ('S');
+        if (cert)
+            putchar ('C');
+    }
+    putchar(':');
+}
+
 
 static void
-list_keyblock( KBNODE keyblock, int secret )
+list_keyblock_print ( KBNODE keyblock, int secret )
 {
     int rc = 0;
     KBNODE kbctx;
@@ -246,8 +213,6 @@
     PKT_secret_key *sk;
     u32 keyid[2];
     int any=0;
-    int trustletter = 0;
-    int ulti_hack = 0;
 
     /* get the keyid from the keyblock */
     node = find_kbnode( keyblock, secret? PKT_SECRET_KEY : PKT_PUBLIC_KEY );
@@ -261,16 +226,7 @@
 	pk = NULL;
 	sk = node->pkt->pkt.secret_key;
 	keyid_from_sk( sk, keyid );
-	if( opt.with_colons )
-	    printf("sec:u:%u:%d:%08lX%08lX:%s:%s:::",
-		    nbits_from_sk( sk ),
-		    sk->pubkey_algo,
-		    (ulong)keyid[0],(ulong)keyid[1],
-		    datestr_from_sk( sk ),
-		    sk->expiredate? strtimestamp(sk->expiredate):""
-		    /* fixme: add LID here */ );
-	else
-	    printf("sec  %4u%c/%08lX %s ", nbits_from_sk( sk ),
+        printf("sec  %4u%c/%08lX %s ", nbits_from_sk( sk ),
 				       pubkey_letter( sk->pubkey_algo ),
 				       (ulong)keyid[1],
 				       datestr_from_sk( sk ) );
@@ -279,48 +235,242 @@
 	pk = node->pkt->pkt.public_key;
 	sk = NULL;
 	keyid_from_pk( pk, keyid );
-	if( opt.with_colons ) {
-	    if ( opt.fast_list_mode ) {
-		fputs( "pub::", stdout );
-		trustletter = 0;
+        printf("pub  %4u%c/%08lX %s ", nbits_from_pk( pk ),
+				       pubkey_letter( pk->pubkey_algo ),
+				       (ulong)keyid[1],
+				       datestr_from_pk( pk ) );
+    }
+
+    for( kbctx=NULL; (node=walk_kbnode( keyblock, &kbctx, 0)) ; ) {
+	if( node->pkt->pkttype == PKT_USER_ID && !opt.fast_list_mode ) {
+	    if( any ) 
+                printf("uid%*s", 28, "");
+
+            if ( node->pkt->pkt.user_id->is_revoked )
+                fputs ("[revoked] ", stdout);
+            print_utf8_string( stdout,  node->pkt->pkt.user_id->name,
+                               node->pkt->pkt.user_id->len );
+	    putchar('\n');
+	    if( !any ) {
+		if( opt.fingerprint )
+		    fingerprint( pk, sk );
+		if( opt.with_key_data )
+		    print_key_data( pk, keyid );
+		any = 1;
+	    }
+	}
+	else if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
+	    u32 keyid2[2];
+	    PKT_public_key *pk2 = node->pkt->pkt.public_key;
+
+	    if( !any ) {
+		putchar('\n');
+		if( opt.fingerprint )
+		    fingerprint( pk, sk ); /* of the main key */
+		any = 1;
+	    }
+
+	    keyid_from_pk( pk2, keyid2 );
+            printf("sub  %4u%c/%08lX %s", nbits_from_pk( pk2 ),
+                   pubkey_letter( pk2->pubkey_algo ),
+                   (ulong)keyid2[1],
+                   datestr_from_pk( pk2 ) );
+            if( pk2->expiredate ) {
+                printf(_(" [expires: %s]"), expirestr_from_pk( pk2 ) );
+            }
+            putchar('\n');
+	    if( opt.fingerprint > 1 )
+		fingerprint( pk2, NULL );
+	    if( opt.with_key_data )
+		print_key_data( pk2, keyid2 );
+	}
+	else if( node->pkt->pkttype == PKT_SECRET_SUBKEY ) {
+	    u32 keyid2[2];
+	    PKT_secret_key *sk2 = node->pkt->pkt.secret_key;
+
+	    if( !any ) {
+		putchar('\n');
+		if( opt.fingerprint )
+		    fingerprint( pk, sk ); /* of the main key */
+		any = 1;
 	    }
+
+	    keyid_from_sk( sk2, keyid2 );
+            printf("ssb  %4u%c/%08lX %s\n", nbits_from_sk( sk2 ),
+					   pubkey_letter( sk2->pubkey_algo ),
+					   (ulong)keyid2[1],
+					   datestr_from_sk( sk2 ) );
+	    if( opt.fingerprint > 1 )
+		fingerprint( NULL, sk2 );
+	}
+	else if( opt.list_sigs && node->pkt->pkttype == PKT_SIGNATURE ) {
+	    PKT_signature *sig = node->pkt->pkt.signature;
+	    int sigrc;
+            char *sigstr;
+
+	    if( !any ) { /* no user id, (maybe a revocation follows)*/
+		if( sig->sig_class == 0x20 )
+		    puts("[revoked]");
+		else if( sig->sig_class == 0x18 )
+		    puts("[key binding]");
+		else if( sig->sig_class == 0x28 )
+		    puts("[subkey revoked]");
+		else
+		    putchar('\n');
+		if( opt.fingerprint )
+		    fingerprint( pk, sk );
+		any=1;
+	    }
+
+	    if( sig->sig_class == 0x20 || sig->sig_class == 0x28
+				       || sig->sig_class == 0x30 )
+	       sigstr = "rev";
+	    else if( (sig->sig_class&~3) == 0x10 )
+	       sigstr = "sig";
+	    else if( sig->sig_class == 0x18 )
+	       sigstr = "sig";
 	    else {
-		trustletter = query_trust_info( pk, NULL );
-		if( trustletter == 'u' )
-		    ulti_hack = 1;
-		printf("pub:%c:", trustletter );
+                printf("sig                             "
+		       "[unexpected signature class 0x%02x]\n",sig->sig_class );
+		continue;
 	    }
-	    printf("%u:%d:%08lX%08lX:%s:%s:",
+	    if( opt.check_sigs ) {
+		fflush(stdout);
+		rc = check_key_signature( keyblock, node, NULL );
+		switch( rc ) {
+		  case 0:		   sigrc = '!'; break;
+		  case G10ERR_BAD_SIGN:    sigrc = '-'; break;
+		  case G10ERR_NO_PUBKEY: 
+		  case G10ERR_UNU_PUBKEY:  sigrc = '?'; break;
+		  default:		   sigrc = '%'; break;
+		}
+	    }
+	    else {
+		rc = 0;
+		sigrc = ' ';
+	    }
+            fputs( sigstr, stdout );
+            printf("%c       %08lX %s  ",
+		    sigrc, (ulong)sig->keyid[1], datestr_from_sig(sig));
+	    if( sigrc == '%' )
+		printf("[%s] ", g10_errstr(rc) );
+	    else if( sigrc == '?' )
+		;
+	    else if ( !opt.fast_list_mode ) {
+		size_t n;
+		char *p = get_user_id( sig->keyid, &n );
+                print_utf8_string( stdout, p, n );
+		m_free(p);
+	    }
+	    putchar('\n');
+	    /* fixme: check or list other sigs here */
+	}
+    }
+    putchar('\n');
+}
+
+
+static void
+list_keyblock_colon( KBNODE keyblock, int secret )
+{
+    int rc = 0;
+    KBNODE kbctx;
+    KBNODE node;
+    PKT_public_key *pk;
+    PKT_secret_key *sk;
+    u32 keyid[2];
+    int any=0;
+    int trustletter = 0;
+    int ulti_hack = 0;
+
+    /* get the keyid from the keyblock */
+    node = find_kbnode( keyblock, secret? PKT_SECRET_KEY : PKT_PUBLIC_KEY );
+    if( !node ) {
+	log_error("Oops; key lost!\n");
+	dump_kbnode( keyblock );
+	return;
+    }
+
+    if( secret ) {
+	pk = NULL;
+	sk = node->pkt->pkt.secret_key;
+	keyid_from_sk( sk, keyid );
+        printf("sec:u:%u:%d:%08lX%08lX:%s:%s:::",
+		    nbits_from_sk( sk ),
+		    sk->pubkey_algo,
+		    (ulong)keyid[0],(ulong)keyid[1],
+		    colon_datestr_from_sk( sk ),
+		    colon_strtime (sk->expiredate)
+		    /* fixme: add LID here */ );
+    }
+    else {
+	pk = node->pkt->pkt.public_key;
+	sk = NULL;
+	keyid_from_pk( pk, keyid );
+        fputs( "pub:", stdout );
+        trustletter = 0;
+        if ( !pk->is_valid )
+            putchar ('i');
+        else if ( pk->is_revoked )
+            putchar ('r');
+        else if ( pk->has_expired )
+            putchar ('e');
+        else if ( opt.fast_list_mode || opt.no_expensive_trust_checks ) 
+            ;
+        else {
+            trustletter = query_trust_info( pk, NULL );
+            if( trustletter == 'u' )
+                ulti_hack = 1;
+            putchar(trustletter);
+        }
+        printf(":%u:%d:%08lX%08lX:%s:%s:",
 		    nbits_from_pk( pk ),
 		    pk->pubkey_algo,
 		    (ulong)keyid[0],(ulong)keyid[1],
-		    datestr_from_pk( pk ),
-		    pk->expiredate? strtimestamp(pk->expiredate):"" );
-	    if( pk->local_id )
-		printf("%lu", pk->local_id );
-	    putchar(':');
-	    if( pk->local_id && !opt.fast_list_mode )
-		putchar( get_ownertrust_info( pk->local_id ) );
+		    colon_datestr_from_pk( pk ),
+		    colon_strtime (pk->expiredate) );
+        if( pk->local_id )
+            printf("%lu", pk->local_id );
+        putchar(':');
+        if( pk->local_id && !opt.fast_list_mode
+            && !opt.no_expensive_trust_checks  )
+            putchar( get_ownertrust_info( pk->local_id ) );
 	    putchar(':');
-	}
-	else
-	    printf("pub  %4u%c/%08lX %s ", nbits_from_pk( pk ),
-				       pubkey_letter( pk->pubkey_algo ),
-				       (ulong)keyid[1],
-				       datestr_from_pk( pk ) );
     }
+    
+    if (opt.fixed_list_mode) {
+        /* do not merge the first uid with the primary key */
+        putchar(':');
+        putchar(':');
+        print_capabilities (pk, sk, keyblock);
+        putchar('\n');
+        if( opt.fingerprint )
+            fingerprint( pk, sk );
+        if( opt.with_key_data )
+            print_key_data( pk, keyid );
+        any = 1;
+    }
+
 
     for( kbctx=NULL; (node=walk_kbnode( keyblock, &kbctx, 0)) ; ) {
 	if( node->pkt->pkttype == PKT_USER_ID && !opt.fast_list_mode ) {
+            /*
+             * Fixme: We need a is_valid flag here too 
+             */
 	    if( any ) {
-		if ( opt.with_colons ) {
+                if ( node->pkt->pkt.user_id->is_revoked )
+        	    printf("uid:r::::::::");
+		else if ( opt.no_expensive_trust_checks ) {
+        	    printf("uid:::::::::");
+	        }
+                else {
 		    byte namehash[20];
 
 		    if( pk && !ulti_hack ) {
 			if( node->pkt->pkt.user_id->photo )
 			    rmd160_hash_buffer( namehash,
-					    node->pkt->pkt.user_id->name,
-					    node->pkt->pkt.user_id->len  );
+					    node->pkt->pkt.user_id->photo,
+					    node->pkt->pkt.user_id->photolen);
 			else
 			    rmd160_hash_buffer( namehash,
 					    node->pkt->pkt.user_id->name,
@@ -330,25 +480,17 @@
 		    else
 			trustletter = 'u';
 		    printf("uid:%c::::::::", trustletter);
-		}
-		else
-		    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 {
-		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 ) {
+            print_string( stdout,  node->pkt->pkt.user_id->name,
+                          node->pkt->pkt.user_id->len, ':' );
+            putchar(':');
+	    if (any)
+                putchar('\n');
+            else {
+                putchar(':');
+                print_capabilities (pk, sk, keyblock);
+                putchar('\n');
 		if( opt.fingerprint )
 		    fingerprint( pk, sk );
 		if( opt.with_key_data )
@@ -361,46 +503,44 @@
 	    PKT_public_key *pk2 = node->pkt->pkt.public_key;
 
 	    if( !any ) {
-		putchar('\n');
+                putchar(':');
+                putchar(':');
+                print_capabilities (pk, sk, keyblock);
+                putchar('\n');
 		if( opt.fingerprint )
 		    fingerprint( pk, sk ); /* of the main key */
 		any = 1;
 	    }
 
-
-
 	    keyid_from_pk( pk2, keyid2 );
-	    if( opt.with_colons ) {
-		if ( opt.fast_list_mode ) {
-		    fputs( "sub::", stdout );
-		}
-		else {
-		    printf("sub:%c:", trustletter );
-		}
-		printf("%u:%d:%08lX%08lX:%s:%s:",
+            fputs ("sub:", stdout );
+            if ( !pk2->is_valid )
+                putchar ('i');
+            else if ( pk2->is_revoked )
+                putchar ('r');
+            else if ( pk2->has_expired )
+                putchar ('e');
+            else if ( opt.fast_list_mode || opt.no_expensive_trust_checks )
+                ;
+            else {
+                printf("%c", trustletter );
+            }
+            printf(":%u:%d:%08lX%08lX:%s:%s:",
 			nbits_from_pk( pk2 ),
 			pk2->pubkey_algo,
 			(ulong)keyid2[0],(ulong)keyid2[1],
-			datestr_from_pk( pk2 ),
-			pk2->expiredate? strtimestamp(pk2->expiredate):""
+			colon_datestr_from_pk( pk2 ),
+			colon_strtime (pk2->expiredate)
 			/* fixme: add LID and ownertrust here */
 						);
-		if( pk->local_id ) /* use the local_id of the main key??? */
-		    printf("%lu", pk->local_id );
-		putchar(':');
-		putchar(':');
-		putchar('\n');
-	    }
-	    else {
-		printf("sub  %4u%c/%08lX %s", nbits_from_pk( pk2 ),
-					   pubkey_letter( pk2->pubkey_algo ),
-					   (ulong)keyid2[1],
-					   datestr_from_pk( pk2 ) );
-		if( pk2->expiredate ) {
-		    printf(_(" [expires: %s]"), expirestr_from_pk( pk2 ) );
-		}
-		putchar('\n');
-	    }
+            if( pk->local_id ) /* use the local_id of the main key??? */
+                printf("%lu", pk->local_id );
+            putchar(':');
+            putchar(':');
+            putchar(':');
+            putchar(':');
+            print_capabilities (pk2, NULL, NULL);
+            putchar('\n');
 	    if( opt.fingerprint > 1 )
 		fingerprint( pk2, NULL );
 	    if( opt.with_key_data )
@@ -411,6 +551,9 @@
 	    PKT_secret_key *sk2 = node->pkt->pkt.secret_key;
 
 	    if( !any ) {
+                putchar(':');
+                putchar(':');
+                print_capabilities (pk, sk, keyblock);
 		putchar('\n');
 		if( opt.fingerprint )
 		    fingerprint( pk, sk ); /* of the main key */
@@ -418,38 +561,35 @@
 	    }
 
 	    keyid_from_sk( sk2, keyid2 );
-	    if( opt.with_colons )
-		printf("ssb::%u:%d:%08lX%08lX:%s:%s:::\n",
+            printf("ssb::%u:%d:%08lX%08lX:%s:%s:::::",
 			nbits_from_sk( sk2 ),
 			sk2->pubkey_algo,
 			(ulong)keyid2[0],(ulong)keyid2[1],
-			datestr_from_sk( sk2 ),
-			sk2->expiredate? strtimestamp(sk2->expiredate):""
-			/* fixme: add LID */
-						);
-	    else
-		printf("ssb  %4u%c/%08lX %s\n", nbits_from_sk( sk2 ),
-					   pubkey_letter( sk2->pubkey_algo ),
-					   (ulong)keyid2[1],
-					   datestr_from_sk( sk2 ) );
+			colon_datestr_from_sk( sk2 ),
+			colon_strtime (sk2->expiredate)
+                   /* fixme: add LID */ );
+            print_capabilities (NULL, sk2, NULL);
+            putchar ('\n');
 	    if( opt.fingerprint > 1 )
 		fingerprint( NULL, sk2 );
-
 	}
 	else if( opt.list_sigs && node->pkt->pkttype == PKT_SIGNATURE ) {
 	    PKT_signature *sig = node->pkt->pkt.signature;
 	    int sigrc;
-	   char *sigstr;
+            char *sigstr;
 
 	    if( !any ) { /* no user id, (maybe a revocation follows)*/
 		if( sig->sig_class == 0x20 )
-		    puts("[revoked]");
+		    fputs("[revoked]:", stdout);
 		else if( sig->sig_class == 0x18 )
-		    puts("[key binding]");
+		    fputs("[key binding]:", stdout);
 		else if( sig->sig_class == 0x28 )
-		    puts("[subkey revoked]");
-		else
-		    putchar('\n');
+		    fputs("[subkey revoked]:", stdout);
+                else
+                    putchar (':');
+                putchar(':');
+                print_capabilities (pk, sk, keyblock);
+                putchar('\n');
 		if( opt.fingerprint )
 		    fingerprint( pk, sk );
 		any=1;
@@ -463,11 +603,7 @@
 	    else if( sig->sig_class == 0x18 )
 	       sigstr = "sig";
 	    else {
-		if( opt.with_colons )
-		    printf("sig::::::::::%02x:\n",sig->sig_class );
-		else
-		    printf("sig                             "
-		       "[unexpected signature class 0x%02x]\n",sig->sig_class );
+                printf("sig::::::::::%02x:\n",sig->sig_class );
 		continue;
 	    }
 	    if( opt.check_sigs ) {
@@ -476,7 +612,8 @@
 		switch( rc ) {
 		  case 0:		   sigrc = '!'; break;
 		  case G10ERR_BAD_SIGN:    sigrc = '-'; break;
-		  case G10ERR_NO_PUBKEY:   sigrc = '?'; break;
+		  case G10ERR_NO_PUBKEY: 
+		  case G10ERR_UNU_PUBKEY:  sigrc = '?'; break;
 		  default:		   sigrc = '%'; break;
 		}
 	    }
@@ -484,18 +621,13 @@
 		rc = 0;
 		sigrc = ' ';
 	    }
-	   fputs( sigstr, stdout );
-	    if( opt.with_colons ) {
-		putchar(':');
-		if( sigrc != ' ' )
-		    putchar(sigrc);
-		printf("::%d:%08lX%08lX:%s::::", sig->pubkey_algo,
+            fputs( sigstr, stdout );
+            putchar(':');
+            if( sigrc != ' ' )
+                putchar(sigrc);
+            printf("::%d:%08lX%08lX:%s::::", sig->pubkey_algo,
 						 (ulong)sig->keyid[0],
-			   (ulong)sig->keyid[1], datestr_from_sig(sig));
-	    }
-	    else
-		printf("%c       %08lX %s  ",
-		    sigrc, (ulong)sig->keyid[1], datestr_from_sig(sig));
+			   (ulong)sig->keyid[1], colon_datestr_from_sig(sig));
 	    if( sigrc == '%' )
 		printf("[%s] ", g10_errstr(rc) );
 	    else if( sigrc == '?' )
@@ -503,28 +635,73 @@
 	    else if ( !opt.fast_list_mode ) {
 		size_t n;
 		char *p = get_user_id( sig->keyid, &n );
-		if( opt.with_colons )
-		    print_string( stdout, p, n, ':' );
-		else
-		    print_utf8_string( stdout, p, n );
+                print_string( stdout, p, n, ':' );
 		m_free(p);
 	    }
-	    if( opt.with_colons )
-		printf(":%02x:", sig->sig_class );
-	    putchar('\n');
-	    /* FIXME: check or list other sigs here (subpkt PRIV_ADD_SIG)*/
+            printf(":%02x:\n", sig->sig_class );
+	    /* fixme: check or list other sigs here */
 	}
     }
     if( !any ) {/* oops, no user id */
-	if( opt.with_colons )
-	    putchar(':');
+        putchar(':');
+        putchar(':');
+        print_capabilities (pk, sk, keyblock);
 	putchar('\n');
     }
-    else if( !opt.with_colons )
-	putchar('\n');  /* separator line */
 }
 
+/*
+ * Reorder the keyblock so that the primary user ID comes first.
+ * Fixme: Replace this by a generic sort function.
+ */
+static void
+reorder_keyblock (KBNODE keyblock)
+{
+    KBNODE primary = NULL, primary0 = NULL, primary2 = NULL;
+    KBNODE last, node;
 
+    for (node=keyblock; node; primary0=node, node = node->next) {
+	if( node->pkt->pkttype == PKT_USER_ID 
+            && node->pkt->pkt.user_id->is_primary ) {
+            primary = primary2 = node;
+            for (node=node->next; node; primary2=node, node = node->next ) {
+                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;
+                }
+            }
+            break;
+        }
+    }
+    if ( !primary )
+        return;  /* no primary key flag found (should not happen) */
+
+    for (last=NULL, node=keyblock; node; last = node, node = node->next) {
+	if( node->pkt->pkttype == PKT_USER_ID )
+            break;
+    }
+    assert (node);
+    assert (last); /* the user ID is never the first packet */
+    assert (primary0);  /* ditto (this is the node before primary) */
+    if ( node == primary )
+        return; /* already the first one */
+
+    last->next = primary;
+    primary0->next = primary2->next;
+    primary2->next = node;
+}
+
+static void
+list_keyblock( KBNODE keyblock, int secret )
+{
+    reorder_keyblock (keyblock);
+    if (opt.with_colons)
+        list_keyblock_colon (keyblock, secret );
+    else
+        list_keyblock_print (keyblock, secret );
+}
 
 static void
 fingerprint( PKT_public_key *pk, PKT_secret_key *sk )
diff -urN gnupg-1.0.4/g10/main.h gnupg-1.0.5/g10/main.h
--- gnupg-1.0.4/g10/main.h	Fri Oct 13 15:25:35 2000
+++ gnupg-1.0.5/g10/main.h	Thu Mar  8 15:06:21 2001
@@ -1,5 +1,5 @@
 /* main.h
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -61,6 +61,10 @@
 u16 checksum_mpi_counted_nbits( MPI a );
 u32 buffer_to_u32( const byte *buffer );
 const byte *get_session_marker( size_t *rlen );
+int openpgp_cipher_test_algo( int algo );
+int openpgp_pk_test_algo( int algo, unsigned int usage_flags );
+int openpgp_pk_algo_usage ( int algo );
+int openpgp_md_test_algo( int algo );
 
 /*-- helptext.c --*/
 void display_online_help( const char *keyword );
@@ -85,7 +89,7 @@
 			  int *is_selfsig, u32 *r_expiredate, int *r_expired );
 
 /*-- delkey.c --*/
-int delete_key( const char *username, int secure );
+int delete_key( const char *username, int secret, int allow_both );
 
 /*-- keyedit.c --*/
 void keyedit_menu( const char *username, STRLIST locusr, STRLIST cmds,
@@ -153,6 +157,9 @@
 /*-- plaintext.c --*/
 int hash_datafiles( MD_HANDLE md, MD_HANDLE md2,
 		    STRLIST files, const char *sigfilename, int textmode );
+
+/*-- pipemode.c --*/
+void run_in_pipemode (void);
 
 /*-- signal.c --*/
 void init_signals(void);
diff -urN gnupg-1.0.4/g10/mainproc.c gnupg-1.0.5/g10/mainproc.c
--- gnupg-1.0.4/g10/mainproc.c	Mon Oct 16 19:12:30 2000
+++ gnupg-1.0.5/g10/mainproc.c	Thu Apr 19 11:34:18 2001
@@ -1,5 +1,5 @@
 /* mainproc.c - handle packets
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -70,8 +70,11 @@
     IOBUF iobuf;    /* used to get the filename etc. */
     int trustletter; /* temp usage in list_node */
     ulong local_id;    /* ditto */
-    struct kidlist_item *failed_pkenc;	/* list of packets for which
-					   we do not have a secret key */
+    struct kidlist_item *pkenc_list;	/* list of encryption packets */
+    struct {
+        int op;
+        int stop_now;
+    } pipemode;
 };
 
 
@@ -88,15 +91,17 @@
 	return;
     proc_tree(c, c->list );
     release_kbnode( c->list );
-    while( c->failed_pkenc ) {
-	struct kidlist_item *tmp = c->failed_pkenc->next;
-	m_free( c->failed_pkenc );
-	c->failed_pkenc = tmp;
+    while( c->pkenc_list ) {
+	struct kidlist_item *tmp = c->pkenc_list->next;
+	m_free( c->pkenc_list );
+	c->pkenc_list = tmp;
     }
-    c->failed_pkenc = NULL;
+    c->pkenc_list = NULL;
     c->list = NULL;
     c->have_data = 0;
     c->last_was_session_key = 0;
+    c->pipemode.op = 0;
+    c->pipemode.stop_now = 0;
     m_free(c->dek); c->dek = NULL;
 }
 
@@ -131,11 +136,35 @@
 static int
 add_gpg_control( CTX c, PACKET *pkt )
 {
-    if ( pkt->pkt.gpg_control->control == 1 ) {
+    if ( pkt->pkt.gpg_control->control == CTRLPKT_CLEARSIGN_START ) {
         /* New clear text signature.
          * Process the last one and reset everything */
         release_list(c);
     }   
+    else if ( pkt->pkt.gpg_control->control == CTRLPKT_PIPEMODE ) {
+        /* Pipemode control packet */
+        if ( pkt->pkt.gpg_control->datalen < 2 ) 
+            log_fatal ("invalid pipemode control packet length\n");
+        if (pkt->pkt.gpg_control->data[0] == 1) {
+            /* start the whole thing */
+            assert ( !c->list ); /* we should be in a pretty virgin state */
+            assert ( !c->pipemode.op );
+            c->pipemode.op = pkt->pkt.gpg_control->data[1];
+        }
+        else if (pkt->pkt.gpg_control->data[0] == 2) {
+            /* the signed material follows in a plaintext packet */
+            assert ( c->pipemode.op == 'B' );
+        }
+        else if (pkt->pkt.gpg_control->data[0] == 3) {
+            assert ( c->pipemode.op == 'B' );
+            release_list (c);
+            /* and tell the outer loop to terminate */
+            c->pipemode.stop_now = 1;
+        }
+        else 
+            log_fatal ("invalid pipemode control packet code\n");
+        return 0; /* no need to store the packet */
+    }   
 
     if( c->list )  /* add another packet */
         add_kbnode( c->list, new_kbnode( pkt ));
@@ -215,8 +244,8 @@
     PKT_symkey_enc *enc;
 
     enc = pkt->pkt.symkey_enc;
-    if( enc->seskeylen )
-	log_error( "symkey_enc packet with session keys are not supported!\n");
+    if (enc->seskeylen)
+	log_error ("symkey_enc packet with session keys are not supported!\n");
     else {
 	c->last_was_session_key = 2;
 	c->dek = passphrase_to_dek( NULL, 0, enc->cipher_algo, &enc->s2k, 0 );
@@ -279,27 +308,30 @@
 
     if( result == -1 )
 	;
-    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 );
-	x->kid[0] = enc->keyid[0];
-	x->kid[1] = enc->keyid[1];
-	x->pubkey_algo = enc->pubkey_algo;
-	x->reason = result;
-	x->next = c->failed_pkenc;
-	c->failed_pkenc = x;
+    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 );
+            }
+        }
+        /* store it for later display */
+        {
+            struct kidlist_item *x = m_alloc( sizeof *x );
+            x->kid[0] = enc->keyid[0];
+            x->kid[1] = enc->keyid[1];
+            x->pubkey_algo = enc->pubkey_algo;
+            x->reason = result;
+            x->next = c->pkenc_list;
+            c->pkenc_list = x;
+        }
     }
     free_packet(pkt);
 }
@@ -311,11 +343,19 @@
  * not decrypt.
  */
 static void
-print_failed_pkenc( struct kidlist_item *list )
+print_pkenc_list( struct kidlist_item *list, int failed )
 {
     for( ; list; list = list->next ) {
-	PKT_public_key *pk = m_alloc_clear( sizeof *pk );
-	const char *algstr = pubkey_algo_to_string( list->pubkey_algo );
+	PKT_public_key *pk;
+	const char *algstr;
+        
+        if ( failed && !list->reason )
+            continue;
+        if ( !failed && list->reason )
+            continue;
+
+        algstr = pubkey_algo_to_string( list->pubkey_algo );
+        pk = m_alloc_clear( sizeof *pk );
 
 	if( !algstr )
 	    algstr = "[?]";
@@ -339,7 +379,6 @@
 	free_public_key( pk );
 
 	if( list->reason == G10ERR_NO_SECKEY ) {
-	    log_info(_("no secret key for decryption available\n"));
 	    if( is_status_enabled() ) {
 		char buf[20];
 		sprintf(buf,"%08lX%08lX", (ulong)list->kid[0],
@@ -347,7 +386,7 @@
 		write_status_text( STATUS_NO_SECKEY, buf );
 	    }
 	}
-	else
+	else if (list->reason)
 	    log_error(_("public key decryption failed: %s\n"),
 						g10_errstr(list->reason));
     }
@@ -359,7 +398,8 @@
 {
     int result = 0;
 
-    print_failed_pkenc( c->failed_pkenc );
+    print_pkenc_list( c->pkenc_list, 1 );
+    print_pkenc_list( c->pkenc_list, 0 );
 
     write_status( STATUS_BEGIN_DECRYPTION );
 
@@ -367,9 +407,11 @@
     if( opt.list_only )
 	result = -1;
     else if( !c->dek && !c->last_was_session_key ) {
+        int def_algo;
 	/* assume this is old conventional encrypted data
-	 * Actually we should use IDEA and MD5 in this case, but because
-	 * IDEA is patented we can't do so */
+	 * We use IDEA here if it is installed */
+        def_algo = check_cipher_algo (CIPHER_ALGO_IDEA)?
+                                      DEFAULT_CIPHER_ALGO : CIPHER_ALGO_IDEA;
 	c->dek = passphrase_to_dek( NULL, 0,
 		    opt.def_cipher_algo ? opt.def_cipher_algo
 					: DEFAULT_CIPHER_ALGO, NULL, 0 );
@@ -441,13 +483,14 @@
 		only_md5 = 0;
 	}
 	else if( n->pkt->pkttype == PKT_GPG_CONTROL
-                 && n->pkt->pkt.gpg_control->control == 1 ) {
+                 && n->pkt->pkt.gpg_control->control
+                    == CTRLPKT_CLEARSIGN_START ) {
             size_t datalen = n->pkt->pkt.gpg_control->datalen;
             const byte *data = n->pkt->pkt.gpg_control->data;
 
             /* check that we have at least the sigclass and one hash */
             if ( datalen < 2 )
-                log_fatal("invalid control packet of type 1\n"); 
+                log_fatal("invalid control packet CTRLPKT_CLEARSIGN_START\n"); 
             /* Note that we don't set the clearsig flag for not-dash-escaped
              * documents */
             clearsig = (*data == 0x01);
@@ -477,16 +520,29 @@
 	if ( c->mfx.md2  )
 	    md_start_debug( c->mfx.md2, "verify2" );
     }
-    rc = handle_plaintext( pt, &c->mfx, c->sigs_only, clearsig );
-    if( rc == G10ERR_CREATE_FILE && !c->sigs_only) {
-	/* can't write output but we hash it anyway to
-	 * check the signature */
-	rc = handle_plaintext( pt, &c->mfx, 1, clearsig );
+    if ( c->pipemode.op == 'B' )
+        rc = handle_plaintext( pt, &c->mfx, 1, 0 );
+    else {
+        rc = handle_plaintext( pt, &c->mfx, c->sigs_only, clearsig );
+        if( rc == G10ERR_CREATE_FILE && !c->sigs_only) {
+            /* can't write output but we hash it anyway to
+             * check the signature */
+            rc = handle_plaintext( pt, &c->mfx, 1, clearsig );
+        }
     }
     if( rc )
 	log_error( "handle plaintext failed: %s\n", g10_errstr(rc));
     free_packet(pkt);
     c->last_was_session_key = 0;
+
+    /* We add a marker control packet instead of the plaintext packet.
+     * This is so that we can later detect invalid packet sequences.
+     */
+    n = new_kbnode (create_gpg_control (CTRLPKT_PLAINTEXT_MARK, NULL, 0));
+    if (c->list)
+        add_kbnode (c->list, n);
+    else 
+        c->list = n;
 }
 
 
@@ -564,8 +620,10 @@
     }
     else if( (sig->sig_class&~3) == 0x10
 	     || sig->sig_class == 0x18
+             || sig->sig_class == 0x1f
 	     || sig->sig_class == 0x20
-	     || sig->sig_class == 0x30	) { /* classes 0x10..0x17,0x20,0x30 */
+	     || sig->sig_class == 0x28
+	     || sig->sig_class == 0x30	) { 
 	if( c->list->pkt->pkttype == PKT_PUBLIC_KEY
 	    || c->list->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
 	    return check_key_signature( c->list, node, is_selfsig );
@@ -675,11 +733,14 @@
 	putc( '=', log_stream() );
 	print_string( log_stream(), p+n1, n2, 0 );
 	putc( '\n', log_stream() );
+        write_status_buffer ( STATUS_NOTATION_NAME, p   , n1, 0 );
+        write_status_buffer ( STATUS_NOTATION_DATA, p+n1, n2, 20 );
     }
     if( (p = parse_sig_subpkt( sig->hashed_data, SIGSUBPKT_POLICY, &n ) )) {
 	log_info(_("Policy: ") );
 	print_string( log_stream(), p, n, 0 );
 	putc( '\n', log_stream() );
+        write_status_buffer ( STATUS_POLICY_URL, p, n, 0 );
     }
 
     /* Now check wheter the key of this signature has some
@@ -720,8 +781,8 @@
 		    nbits_from_pk( pk ),
 		    pk->pubkey_algo,
 		    (ulong)keyid[0],(ulong)keyid[1],
-		    datestr_from_pk( pk ),
-		    pk->expiredate? strtimestamp(pk->expiredate):"" );
+		    colon_datestr_from_pk( pk ),
+		    colon_strtime (pk->expiredate) );
 	    if( c->local_id )
 		printf("%lu", c->local_id );
 	    putchar(':');
@@ -807,8 +868,8 @@
 		    nbits_from_sk( sk ),
 		    sk->pubkey_algo,
 		    (ulong)keyid[0],(ulong)keyid[1],
-		    datestr_from_sk( sk ),
-		    sk->expiredate? strtimestamp(sk->expiredate):""
+		    colon_datestr_from_sk( sk ),
+		    colon_strtime (sk->expiredate)
 		    /* fixme: add LID */ );
 	}
 	else
@@ -880,7 +941,8 @@
 	    switch( (rc2=do_check_sig( c, node, &is_selfsig )) ) {
 	      case 0:		       sigrc = '!'; break;
 	      case G10ERR_BAD_SIGN:    sigrc = '-'; break;
-	      case G10ERR_NO_PUBKEY:   sigrc = '?'; break;
+	      case G10ERR_NO_PUBKEY: 
+	      case G10ERR_UNU_PUBKEY:  sigrc = '?'; break;
 	      default:		       sigrc = '%'; break;
 	    }
 	}
@@ -904,7 +966,7 @@
 		putchar(sigrc);
 	    printf("::%d:%08lX%08lX:%s::::", sig->pubkey_algo,
 					     (ulong)sig->keyid[0],
-		       (ulong)sig->keyid[1], datestr_from_sig(sig));
+		       (ulong)sig->keyid[1], colon_datestr_from_sig(sig));
 	}
 	else
 	    printf("%c       %08lX %s   ",
@@ -993,7 +1055,9 @@
 	any_data = 1;
 	if( rc ) {
 	    free_packet(pkt);
-	    if( rc == G10ERR_INVALID_PACKET )
+            /* stop processing hwne an invalid packet has been encountered
+             * but don't do so when we are doing a --list-packet. */
+	    if( rc == G10ERR_INVALID_PACKET && opt.list_packets != 2 )
 		break;
 	    continue;
 	}
@@ -1017,6 +1081,7 @@
 	      case PKT_PUBKEY_ENC:
 	      case PKT_ENCRYPTED:
 	      case PKT_ENCRYPTED_MDC:
+                write_status_text( STATUS_UNEXPECTED, "0" );
 		rc = G10ERR_UNEXPECTED;
 		goto leave;
 	      case PKT_SIGNATURE:   newpkt = add_signature( c, pkt ); break;
@@ -1032,6 +1097,7 @@
 	      case PKT_PUBLIC_KEY:
 	      case PKT_SECRET_KEY:
 	      case PKT_USER_ID:
+                write_status_text( STATUS_UNEXPECTED, "0" );
 		rc = G10ERR_UNEXPECTED;
 		goto leave;
 	      case PKT_SIGNATURE:   newpkt = add_signature( c, pkt ); break;
@@ -1091,6 +1157,12 @@
 	}
 	else
 	    free_packet(pkt);
+        if ( c->pipemode.stop_now ) {
+            /* we won't get an EOF in pipemode, so we have to 
+             * break the loop here */ 
+            rc = -1;
+            break;
+        }
     }
     if( rc == G10ERR_INVALID_PACKET )
 	write_status_text( STATUS_NODATA, "3" );
@@ -1132,22 +1204,48 @@
      * data+sig, sig+data,sig+data and we have not yet encountered the last
      * data, we could also see this a one data with 2 signatures and then 
      * data+sig.
-     * To protect against this we check that we all signatures follow
+     * To protect against this we check that all signatures follow
      * without any intermediate packets.  Note, that we won't get this
      * error when we use onepass packets or cleartext signatures because
      * we reset the list every time
+     *
+     * FIXME: Now that we have these marker packets, we should create a 
+     * real grammar and check against this.
      */
     {
         KBNODE n;
-        int tmp=0;
+        int n_sig=0;
 
-        for(n=c->list; n; n=n->next ) {
-            if ( tmp && n->pkt->pkttype == PKT_SIGNATURE ) {
-                log_error("can't handle these multiple signatures\n");
-                return 0;
+        for (n=c->list; n; n=n->next ) {
+            if ( n->pkt->pkttype == PKT_SIGNATURE ) 
+                n_sig++;
+        }
+        if (n_sig > 1) { /* more than one signature - check sequence */
+            int tmp, onepass;
+
+            for (tmp=onepass=0,n=c->list; n; n=n->next ) {
+                if (n->pkt->pkttype == PKT_ONEPASS_SIG) 
+                    onepass++;
+                else if (n->pkt->pkttype == PKT_GPG_CONTROL
+                         && n->pkt->pkt.gpg_control->control
+                            == CTRLPKT_CLEARSIGN_START ) {
+                    onepass++; /* handle the same way as a onepass */
+                }
+                else if ( (tmp && n->pkt->pkttype != PKT_SIGNATURE) ) {
+                    log_error(_("can't handle these multiple signatures\n"));
+                    return 0;
+                }
+                else if ( n->pkt->pkttype == PKT_SIGNATURE ) 
+                    tmp = 1;
+                else if (!tmp && !onepass 
+                         && n->pkt->pkttype == PKT_GPG_CONTROL
+                         && n->pkt->pkt.gpg_control->control
+                            == CTRLPKT_PLAINTEXT_MARK ) {
+                    /* plaintext before signatures but no one-pass packets*/
+                    log_error(_("can't handle these multiple signatures\n"));
+                    return 0;
+                }
             }
-            else if ( n->pkt->pkttype == PKT_SIGNATURE ) 
-                tmp = 1;
         }
     }
     
@@ -1174,28 +1272,45 @@
 	write_status_text( rc? STATUS_BADSIG : STATUS_GOODSIG, us );
 	m_free(us);
 
-	/* fixme: list only user ids which are valid and add information
-	 *	  about the trustworthiness of each user id, sort them.
-	 *	  Integrate this with check_signatures_trust(). */
+        /* find an print the primary user ID */
 	for( un=keyblock; un; un = un->next ) {
 	    if( un->pkt->pkttype != PKT_USER_ID )
 		continue;
-	    if( !count++ )
-		log_info(rc? _("BAD signature from \"")
-			   : _("Good signature from \""));
-	    else
-		log_info(    _("                aka \""));
+            if ( un->pkt->pkt.user_id->is_revoked )
+                continue;
+            if ( !un->pkt->pkt.user_id->is_primary )
+                continue;
+            
+            log_info(rc? _("BAD signature from \"")
+                       : _("Good signature from \""));
 	    print_utf8_string( log_stream(), un->pkt->pkt.user_id->name,
 					     un->pkt->pkt.user_id->len );
 	    fputs("\"\n", log_stream() );
-	    if( rc )
-		break; /* print only one id in this case */
+            count++;
 	}
 	if( !count ) {	/* just in case that we have no userid */
 	    log_info(rc? _("BAD signature from \"")
 		       : _("Good signature from \""));
 	    fputs("[?]\"\n", log_stream() );
 	}
+
+        /* If we have a good signature and already printed 
+         * the primary user ID, print all the other user IDs */
+        if ( count && !rc ) {
+            for( un=keyblock; un; un = un->next ) {
+                if( un->pkt->pkttype != PKT_USER_ID )
+                    continue;
+                if ( un->pkt->pkt.user_id->is_revoked )
+                    continue; 
+                if ( un->pkt->pkt.user_id->is_primary )
+                    continue;
+
+		log_info(    _("                aka \""));
+                print_utf8_string( log_stream(), un->pkt->pkt.user_id->name,
+                                                 un->pkt->pkt.user_id->len );
+                fputs("\"\n", log_stream() );
+            }
+	}
 	release_kbnode( keyblock );
 	if( !rc )
 	    print_notation_data( sig );
@@ -1258,6 +1373,18 @@
     if( opt.list_packets || opt.list_only )
 	return;
 
+    /* we must skip our special plaintext marker packets here becuase
+       they may be the root packet.  These packets are only used in
+       addionla checks and skipping them here doesn't matter */
+    while ( node
+            && node->pkt->pkttype == PKT_GPG_CONTROL
+            && node->pkt->pkt.gpg_control->control
+                         == CTRLPKT_PLAINTEXT_MARK ) {
+        node = node->next;
+    }
+    if (!node)
+        return;
+
     c->local_id = 0;
     c->trustletter = ' ';
     if( node->pkt->pkttype == PKT_PUBLIC_KEY
@@ -1288,7 +1415,7 @@
 	    }
 	    else {
 		rc = ask_for_detached_datafile( c->mfx.md, c->mfx.md2,
-						iobuf_get_fname(c->iobuf),
+						iobuf_get_real_fname(c->iobuf),
 			n1? (n1->pkt->pkt.onepass_sig->sig_class == 0x01):0 );
 	    }
 	    if( rc ) {
@@ -1296,17 +1423,26 @@
 		return;
 	    }
 	}
+        else if ( c->signed_data ) {
+            log_error (_("not a detached signature\n") );
+            return;
+        }
 
 	for( n1 = node; (n1 = find_next_kbnode(n1, PKT_SIGNATURE )); )
 	    check_sig_and_print( c, n1 );
     }
     else if( node->pkt->pkttype == PKT_GPG_CONTROL
-             && node->pkt->pkt.gpg_control->control == 1 ) {
+             && node->pkt->pkt.gpg_control->control
+                == CTRLPKT_CLEARSIGN_START ) {
         /* clear text signed message */
 	if( !c->have_data ) {
             log_error("cleartext signature without data\n" );
             return;
         }
+        else if ( c->signed_data ) {
+            log_error (_("not a detached signature\n") );
+            return;
+        }
 	
 	for( n1 = node; (n1 = find_next_kbnode(n1, PKT_SIGNATURE )); )
 	    check_sig_and_print( c, n1 );
@@ -1357,7 +1493,7 @@
 	    }
 	    else {
 		rc = ask_for_detached_datafile( c->mfx.md, c->mfx.md2,
-						iobuf_get_fname(c->iobuf),
+						iobuf_get_real_fname(c->iobuf),
 						(sig->sig_class == 0x01) );
 	    }
 	    if( rc ) {
@@ -1365,14 +1501,23 @@
 		return;
 	    }
 	}
-	else
+        else if ( c->signed_data ) {
+            log_error (_("not a detached signature\n") );
+            return;
+        }
+        else if ( c->pipemode.op == 'B' )
+            ; /* this is a detached signature trough the pipemode handler */
+	else 
 	    log_info(_("old style (PGP 2.x) signature\n"));
 
-	check_sig_and_print( c, node );
+	for( n1 = node; n1; (n1 = find_next_kbnode(n1, PKT_SIGNATURE )) )
+	    check_sig_and_print( c, n1 );
     }
-    else
+    else {
+        dump_kbnode (c->list);
 	log_error(_("invalid root packet detected in proc_tree()\n"));
-
+        dump_kbnode (node);
+    }
 }
 
 
diff -urN gnupg-1.0.4/g10/mdfilter.c gnupg-1.0.5/g10/mdfilter.c
--- gnupg-1.0.4/g10/mdfilter.c	Tue May  9 09:03:24 2000
+++ gnupg-1.0.5/g10/mdfilter.c	Thu Mar  8 15:06:38 2001
@@ -1,5 +1,5 @@
 /* mdfilter.c - filter data and calculate a message digest
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/g10/misc.c gnupg-1.0.5/g10/misc.c
--- gnupg-1.0.4/g10/misc.c	Fri Oct 13 16:39:17 2000
+++ gnupg-1.0.5/g10/misc.c	Sun Apr 22 16:01:31 2001
@@ -1,5 +1,5 @@
 /* misc.c -  miscellaneous functions
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -29,6 +29,7 @@
   #include <asm/unistd.h>
 #endif
 #ifdef HAVE_SETRLIMIT
+  #include <time.h>
   #include <sys/time.h>
   #include <sys/resource.h>
 #endif
@@ -224,6 +225,9 @@
 	     || algo == CIPHER_ALGO_CAST5
 	     || algo == CIPHER_ALGO_BLOWFISH
 	     || algo == CIPHER_ALGO_TWOFISH
+	     || algo == CIPHER_ALGO_RIJNDAEL
+	     || algo == CIPHER_ALGO_RIJNDAEL192
+	     || algo == CIPHER_ALGO_RIJNDAEL256
 	   )
 	;
     else {
@@ -231,7 +235,7 @@
 
 	if( !did_note ) {
 	    did_note = 1;
-	    log_info(_("this cipher algorithm is depreciated; "
+	    log_info(_("this cipher algorithm is deprecated; "
 		       "please use a more standard one!\n"));
 	}
     }
@@ -253,7 +257,7 @@
     static int initialized;
 
     if ( !initialized ) {
-        volatile ulong aa, bb; /* we really want the unitialized value */
+        volatile ulong aa, bb; /* we really want the uninitialized value */
         ulong a, b;
 
         initialized = 1;
@@ -271,6 +275,79 @@
     *rlen = sizeof(marker);
     return marker;
 }
+
+/****************
+ * Wrapper around the libgcrypt function with addional checks on
+ * openPGP contraints for the algo ID.
+ */
+int
+openpgp_cipher_test_algo( int algo )
+{
+    if( algo < 0 || algo > 110 )
+        return G10ERR_CIPHER_ALGO;
+    return check_cipher_algo(algo);
+}
+
+int
+openpgp_pk_test_algo( int algo, unsigned int usage_flags )
+{
+    if( algo < 0 || algo > 110 )
+	return G10ERR_PUBKEY_ALGO;
+    return check_pubkey_algo2( algo, usage_flags );
+}
+
+int 
+openpgp_pk_algo_usage ( int algo )
+{
+    int usage = 0; 
+    
+    /* they are hardwired in gpg 1.0 */
+    switch ( algo ) {    
+      case PUBKEY_ALGO_RSA:
+          usage = PUBKEY_USAGE_SIG | PUBKEY_USAGE_ENC;
+          break;
+      case PUBKEY_ALGO_RSA_E:
+          usage = PUBKEY_USAGE_ENC;
+          break;
+      case PUBKEY_ALGO_RSA_S:
+          usage = PUBKEY_USAGE_SIG;
+          break;
+      case PUBKEY_ALGO_ELGAMAL_E:
+          usage = PUBKEY_USAGE_ENC;
+          break;
+      case PUBKEY_ALGO_DSA:  
+          usage = PUBKEY_USAGE_SIG;
+          break;
+      case PUBKEY_ALGO_ELGAMAL:
+          usage = PUBKEY_USAGE_SIG | PUBKEY_USAGE_ENC;
+          break;
+      default:
+          break;
+    }
+    return usage;
+
+}
+
+
+
+int
+openpgp_md_test_algo( int algo )
+{
+    if( algo < 0 || algo > 110 )
+        return G10ERR_DIGEST_ALGO;
+    return check_digest_algo(algo);
+}
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff -urN gnupg-1.0.4/g10/openfile.c gnupg-1.0.5/g10/openfile.c
--- gnupg-1.0.4/g10/openfile.c	Tue Sep  5 17:31:57 2000
+++ gnupg-1.0.5/g10/openfile.c	Wed Apr 18 09:07:38 2001
@@ -1,5 +1,5 @@
 /* openfile.c
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -155,6 +155,8 @@
 	fname = defname; defname = NULL;
     }
     m_free(defname);
+    if (fname)
+        trim_spaces (fname);
     return fname;
 }
 
@@ -221,7 +223,19 @@
 	    name = buf;
 	}
 
-	if( overwrite_filep( name ) ) {
+        rc = 0;
+	while( !overwrite_filep (name) ) {
+            char *tmp = ask_outfile_name (NULL, 0);
+            if ( !tmp || !*tmp ) {
+                m_free (tmp);
+                rc = G10ERR_FILE_EXISTS;
+                break;
+            }
+            m_free (buf);
+            name = buf = tmp;
+        }
+
+	if( !rc ) {
 	    if( !(*a = iobuf_create( name )) ) {
 		log_error(_("%s: can't create: %s\n"), name, strerror(errno) );
 		rc = G10ERR_CREATE_FILE;
@@ -229,8 +243,6 @@
 	    else if( opt.verbose )
 		log_info(_("writing to `%s'\n"), name );
 	}
-	else
-	    rc = G10ERR_FILE_EXISTS;
 	m_free(buf);
     }
     return rc;
@@ -255,9 +267,9 @@
                         || !strcmp(iname + len - 4, ".asc")) ) {
 	    char *buf;
 	    buf = m_strdup(iname);
-	    buf[len-4] = 0 ;
+	    buf[len-(buf[len-1]=='n'?5:4)] = 0 ;
 	    a = iobuf_open( buf );
-	    if( opt.verbose )
+	    if( a && opt.verbose )
 		log_info(_("assuming signed data in `%s'\n"), buf );
 	    m_free(buf);
 	}
@@ -329,7 +341,7 @@
 
     if ( ( *defhome == '~'
            && ( strlen(fname) >= strlen (defhome+1)
-                && !strcmp(fname+strlen(defhome+1)-strlen(defhome+1),
+                && !strcmp(fname+strlen(fname)-strlen(defhome+1),
                            defhome+1 ) ))
          || ( *defhome != '~'
               && !compare_filenames( fname, defhome ) )
@@ -345,7 +357,3 @@
 	g10_exit(1);
     }
 }
-
-
-
-
diff -urN gnupg-1.0.4/g10/options.h gnupg-1.0.5/g10/options.h
--- gnupg-1.0.4/g10/options.h	Wed Aug 23 19:40:24 2000
+++ gnupg-1.0.5/g10/options.h	Tue Mar 27 16:24:39 2001
@@ -1,5 +1,5 @@
 /* options.h
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -44,7 +44,7 @@
     int fingerprint; /* list fingerprints */
     int list_sigs;   /* list signatures */
     int no_armor;
-    int list_packets; /* list-packets mode */
+    int list_packets; /* list-packets mode: 1=normal, 2=invoked by command*/
     int def_cipher_algo;
     int force_v3_sigs;
     int force_mdc;
@@ -89,13 +89,20 @@
     ulong set_filesize;
     int honor_http_proxy;
     int fast_list_mode;
+    int fixed_list_mode;
     int ignore_time_conflict;
+    int ignore_crc_error;
     int command_fd;
     int auto_key_retrieve;
     const char *override_session_key;
     int show_session_key;
+    int use_agent;
     int merge_only;
+    int allow_secret_key_import;
     int try_all_secrets;
+    int no_expensive_trust_checks;
+    int no_sig_cache;
+    int no_sig_create_check;
 } opt;
 
 
diff -urN gnupg-1.0.4/g10/options.skel gnupg-1.0.5/g10/options.skel
--- gnupg-1.0.4/g10/options.skel	Fri Oct  8 20:34:41 1999
+++ gnupg-1.0.5/g10/options.skel	Mon Apr 23 13:44:43 2001
@@ -1,7 +1,16 @@
 These first three lines are not copied to the options file in
 the users home directory.
-$Id: options.skel,v 1.12.2.1 1999/10/08 18:34:41 wkoch Exp $
+$Id: options.skel,v 1.12.2.5 2001/04/23 11:44:43 werner Exp $
 # Options for GnuPG
+# Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+# 
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+# 
+# This file is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
 # Unless you you specify which option file to use (with the
 # commandline option "--options filename"), GnuPG uses the
@@ -22,6 +31,18 @@
 
 #default-key 621CC013
 
+# GnuPG ultimately trusts all keys in the secret keyring.  If you do
+# not have all your secret keys online available you should use this
+# option to tell GnuPG about ultimately trusted keys.
+# You have to give the long keyID here which can be obtained by using
+# the --list-key command along with the option --with-colons; you will
+# get a line similiar to this one:
+#    pub:u:1024:17:5DE249965B0358A2:1999-03-15:2006-02-04:59:f:
+# the 5th field is what you want.
+
+#trusted-key 12345678ABCDEF01
+
+
 # If you do not pass a recipient to gpg, it will ask for one.
 # Using this option you can encrypt to a default key.  key validation
 # will not be done in this case.
@@ -39,15 +60,15 @@
 
 # Because some mailers change lines starting with "From " to ">From "
 # it is good to handle such lines in a special way when creating
-# cleartext signatures; all other PGP versions it this way too.
+# cleartext signatures; all other PGP versions do it this way too.
 # To enable full OpenPGP compliance you have to remove this option.
 
 escape-from-lines
 
 # If you do not use the Latin-1 (ISO-8859-1) charset, you should
 # tell GnuPG which is the native character set.  Please check
-# the man page for supported character sets.
-#charset koi8-r
+# the man page for supported character sets. 
+#charset utf-8
 
 
 # You may define aliases like this:
@@ -72,15 +93,27 @@
 
 
 # GnuPG can import a key from a HKP keyerver if one is missing
-# for sercain operations. Is you set this option to a keyserver
+# for certain operations. Is you set this option to a keyserver
 # you will be asked in such a case whether GnuPG should try to
 # import the key from that server (server do syncronize with each
-# others and DNS Round-Robin may give you a random server each time).
+# other and DNS Round-Robin may give you a random server each time).
 # Use "host -l pgp.net | grep www" to figure out a keyserver.
-#keyserver wwwkeys.eu.pgp.net
+#
+# If you do not want to use the default port 11371, you can give the
+# name of the keyserver like this: 
+#   x-hkp://keyserver.example.net:22742
+# If you have problems connecting through a buggy proxy, you can use this:
+#   x-broken-hkp://keyserver.example.net:11371
+# But first you should make sure that you have read the man page regarding
+# proxies (--honor-http-proxy)
+# Most users just set the name of the preferred keyserver.
+#keyserver wwwkeys.nl.pgp.net
 
 # The environment variable http_proxy is only used when the
 # this option is set.
 
 honor-http-proxy
+
+
+
 
diff -urN gnupg-1.0.4/g10/packet.h gnupg-1.0.5/g10/packet.h
--- gnupg-1.0.4/g10/packet.h	Fri Oct 13 16:16:51 2000
+++ gnupg-1.0.5/g10/packet.h	Thu Apr  5 11:48:20 2001
@@ -1,5 +1,5 @@
-/* packet.h - packet read/write stuff
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+/* packet.h - packet definitions
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -55,6 +55,14 @@
 
 typedef struct packet_struct PACKET;
 
+/* PKT_GPG_CONTROL types */
+typedef enum {
+    CTRLPKT_CLEARSIGN_START = 1,
+    CTRLPKT_PIPEMODE = 2,
+    CTRLPKT_PLAINTEXT_MARK =3
+} ctrlpkttype_t;
+
+
 typedef struct {
     int  mode;
     byte hash_algo;
@@ -122,7 +130,14 @@
     byte    version;
     byte    pubkey_algo;    /* algorithm used for public key scheme */
     byte    pubkey_usage;   /* for now only used to pass it to getkey() */
+    u32     created;        /* according to the self-signature */
+    byte    req_usage;      /* hack to pass a request to getkey() */
+    byte    req_algo;       /* Ditto */
+    u32     has_expired;    /* set to the expiration date if expired */ 
+    int     is_revoked;     /* key has been revoked */
+    int     is_valid;       /* key (especially subkey) is valid */
     ulong   local_id;	    /* internal use, valid if > 0 */
+    u32     main_keyid[2];  /* keyid of the primary key */
     u32     keyid[2];	    /* calculated by keyid_from_pk() */
     byte    *namehash;	    /* if != NULL: found by this name */
     MPI     pkey[PUBKEY_MAX_NPKEY];
@@ -135,6 +150,14 @@
     byte    version;
     byte    pubkey_algo;    /* algorithm used for public key scheme */
     byte    pubkey_usage;
+    u32     created;        /* according to the self-signature */
+    byte    req_usage;
+    byte    req_algo;
+    u32     has_expired;    /* set to the expiration date if expired */ 
+    int     is_revoked;     /* key has been revoked */
+    int     is_valid;       /* key (especially subkey) is valid */
+    u32     main_keyid[2];  /* keyid of the primary key */
+    u32     keyid[2];   
     byte is_primary;
     byte is_protected;	/* The secret info is protected and must */
 			/* be decrypted before use, the protected */
@@ -160,6 +183,11 @@
     int  len;		  /* length of the name */
     char *photo;	  /* if this is not NULL, the packet is a photo ID */
     int photolen;	  /* and the length of the photo */
+    int help_key_usage;
+    u32 help_key_expire;
+    int is_primary;
+    int is_revoked;  
+    u32 created;          /* according to the self-signature */
     char name[1];
 } PKT_user_id;
 
@@ -172,6 +200,7 @@
 
 typedef struct {
     u32  len;		  /* length of encrypted data */
+    int  extralen;        /* this is (blocksize+2) */
     byte new_ctb;	  /* uses a new CTB */
     byte mdc_method;	  /* > 0: integrity protected encrypted data packet */
     IOBUF buf;		  /* IOBUF reference */
@@ -253,7 +282,7 @@
     SIGSUBPKT_KEY_FLAGS    =27, /* key flags */
     SIGSUBPKT_SIGNERS_UID  =28, /* signer's user id */
     SIGSUBPKT_REVOC_REASON =29, /* reason for revocation */
-    SIGSUBPKT_PRIV_ADD_SIG =101,/* signatur is also valid for this uid */
+    SIGSUBPKT_PRIV_VERIFY_CACHE =101, /* cache verification result */
 
     SIGSUBPKT_FLAG_CRITICAL=128
 } sigsubpkttype_t;
@@ -270,21 +299,31 @@
 int set_packet_list_mode( int mode );
 
 #if DEBUG_PARSE_PACKET
-int dbg_search_packet( IOBUF inp, PACKET *pkt, int pkttype, ulong *retpos, const char* file, int lineno  );
-int dbg_parse_packet( IOBUF inp, PACKET *ret_pkt, const char* file, int lineno );
-int dbg_copy_all_packets( IOBUF inp, IOBUF out, const char* file, int lineno  );
-int dbg_copy_some_packets( IOBUF inp, IOBUF out, ulong stopoff, const char* file, int lineno  );
-int dbg_skip_some_packets( IOBUF inp, unsigned n, const char* file, int lineno	);
-#define search_packet( a,b,c,d )   dbg_search_packet( (a), (b), (c), (d), __FILE__, __LINE__ )
-#define parse_packet( a, b )	   dbg_parse_packet( (a), (b), __FILE__, __LINE__ )
-#define copy_all_packets( a,b )    dbg_copy_all_packets((a),(b), __FILE__, __LINE__ )
-#define copy_some_packets( a,b,c ) dbg_copy_some_packets((a),(b),(c), __FILE__, __LINE__ )
-#define skip_some_packets( a,b )   dbg_skip_some_packets((a),(b), __FILE__, __LINE__ )
+int dbg_search_packet( IOBUF inp, PACKET *pkt, int pkttype, off_t *retpos,
+                       const char* file, int lineno  );
+int dbg_parse_packet( IOBUF inp, PACKET *ret_pkt,
+                      const char* file, int lineno );
+int dbg_copy_all_packets( IOBUF inp, IOBUF out,
+                          const char* file, int lineno  );
+int dbg_copy_some_packets( IOBUF inp, IOBUF out, off_t stopoff,
+                           const char* file, int lineno  );
+int dbg_skip_some_packets( IOBUF inp, unsigned n,
+                           const char* file, int lineno	);
+#define search_packet( a,b,c,d )   \
+             dbg_search_packet( (a), (b), (c), (d), __FILE__, __LINE__ )
+#define parse_packet( a, b )  \
+	     dbg_parse_packet( (a), (b), __FILE__, __LINE__ )
+#define copy_all_packets( a,b )  \
+             dbg_copy_all_packets((a),(b), __FILE__, __LINE__ )
+#define copy_some_packets( a,b,c ) \
+             dbg_copy_some_packets((a),(b),(c), __FILE__, __LINE__ )
+#define skip_some_packets( a,b ) \
+             dbg_skip_some_packets((a),(b), __FILE__, __LINE__ )
 #else
-int search_packet( IOBUF inp, PACKET *pkt, int pkttype, ulong *retpos );
+int search_packet( IOBUF inp, PACKET *pkt, int pkttype, off_t *retpos );
 int parse_packet( IOBUF inp, PACKET *ret_pkt);
 int copy_all_packets( IOBUF inp, IOBUF out );
-int copy_some_packets( IOBUF inp, IOBUF out, ulong stopoff );
+int copy_some_packets( IOBUF inp, IOBUF out, off_t stopoff );
 int skip_some_packets( IOBUF inp, unsigned n );
 #endif
 
@@ -294,6 +333,8 @@
 				       size_t *ret_n );
 const byte *parse_sig_subpkt2( PKT_signature *sig,
 			       sigsubpkttype_t reqtype, size_t *ret_n );
+PACKET *create_gpg_control ( ctrlpkttype_t type,
+                             const byte *data, size_t datalen );
 
 /*-- build-packet.c --*/
 int build_packet( IOBUF inp, PACKET *pkt );
@@ -302,6 +343,7 @@
 void build_sig_subpkt( PKT_signature *sig, sigsubpkttype_t type,
 			const byte *buffer, size_t buflen );
 void build_sig_subpkt_from_sig( PKT_signature *sig );
+size_t delete_sig_subpkt( byte *buffer, sigsubpkttype_t type );
 
 /*-- free-packet.c --*/
 void free_symkey_enc( PKT_symkey_enc *enc );
@@ -319,6 +361,7 @@
 PKT_public_key *copy_public_key_new_namehash( PKT_public_key *d,
 					      PKT_public_key *s,
 					      const byte *namehash );
+void copy_public_parts_to_secret_key( PKT_public_key *pk, PKT_secret_key *sk );
 PKT_secret_key *copy_secret_key( PKT_secret_key *d, PKT_secret_key *s );
 PKT_signature *copy_signature( PKT_signature *d, PKT_signature *s );
 PKT_user_id *copy_user_id( PKT_user_id *d, PKT_user_id *s );
diff -urN gnupg-1.0.4/g10/parse-packet.c gnupg-1.0.5/g10/parse-packet.c
--- gnupg-1.0.4/g10/parse-packet.c	Fri Oct 13 16:48:55 2000
+++ gnupg-1.0.5/g10/parse-packet.c	Thu Apr  5 12:44:26 2001
@@ -1,5 +1,5 @@
 /* parse-packet.c  - read packets
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -39,7 +39,7 @@
 static int list_mode = 0;
 
 static int  parse( IOBUF inp, PACKET *pkt, int reqtype,
-		   ulong *retpos, int *skip, IOBUF out, int do_skip
+                  off_t *retpos, int *skip, IOBUF out, int do_skip
 	    #ifdef DEBUG_PARSE_PACKET
 		   ,const char *dbg_w, const char *dbg_f, int dbg_l
 	    #endif
@@ -158,7 +158,7 @@
  */
 #ifdef DEBUG_PARSE_PACKET
 int
-dbg_search_packet( IOBUF inp, PACKET *pkt, int pkttype, ulong *retpos,
+dbg_search_packet( IOBUF inp, PACKET *pkt, int pkttype, off_t *retpos,
 		   const char *dbg_f, int dbg_l )
 {
     int skip, rc;
@@ -170,7 +170,7 @@
 }
 #else
 int
-search_packet( IOBUF inp, PACKET *pkt, int pkttype, ulong *retpos )
+search_packet( IOBUF inp, PACKET *pkt, int pkttype, off_t *retpos )
 {
     int skip, rc;
 
@@ -215,7 +215,7 @@
  */
 #ifdef DEBUG_PARSE_PACKET
 int
-dbg_copy_some_packets( IOBUF inp, IOBUF out, ulong stopoff,
+dbg_copy_some_packets( IOBUF inp, IOBUF out, off_t stopoff,
 		   const char *dbg_f, int dbg_l )
 {
     PACKET pkt;
@@ -230,7 +230,7 @@
 }
 #else
 int
-copy_some_packets( IOBUF inp, IOBUF out, ulong stopoff )
+copy_some_packets( IOBUF inp, IOBUF out, off_t stopoff )
 {
     PACKET pkt;
     int skip, rc=0;
@@ -284,7 +284,7 @@
  * if OUT is not NULL, a special copymode is used.
  */
 static int
-parse( IOBUF inp, PACKET *pkt, int reqtype, ulong *retpos,
+parse( IOBUF inp, PACKET *pkt, int reqtype, off_t *retpos,
        int *skip, IOBUF out, int do_skip
 #ifdef DEBUG_PARSE_PACKET
        ,const char *dbg_w, const char *dbg_f, int dbg_l
@@ -309,8 +309,7 @@
     hdrlen=0;
     hdr[hdrlen++] = ctb;
     if( !(ctb & 0x80) ) {
-	log_error("%s: invalid packet (ctb=%02x) near %lu\n",
-			    iobuf_where(inp), ctb, iobuf_tell(inp) );
+       log_error("%s: invalid packet (ctb=%02x)\n", iobuf_where(inp), ctb );
 	rc = G10ERR_INVALID_PACKET;
 	goto leave;
     }
@@ -577,19 +576,23 @@
 parse_symkeyenc( IOBUF inp, int pkttype, unsigned long pktlen, PACKET *packet )
 {
     PKT_symkey_enc *k;
+    int rc = 0;
     int i, version, s2kmode, cipher_algo, hash_algo, seskeylen, minlen;
 
     if( pktlen < 4 ) {
 	log_error("packet(%d) too short\n", pkttype);
+        rc = G10ERR_INVALID_PACKET;
 	goto leave;
     }
     version = iobuf_get_noeof(inp); pktlen--;
     if( version != 4 ) {
 	log_error("packet(%d) with unknown version %d\n", pkttype, version);
+        rc = G10ERR_INVALID_PACKET;
 	goto leave;
     }
     if( pktlen > 200 ) { /* (we encode the seskeylen in a byte) */
 	log_error("packet(%d) too large\n", pkttype);
+        rc = G10ERR_INVALID_PACKET;
 	goto leave;
     }
     cipher_algo = iobuf_get_noeof(inp); pktlen--;
@@ -611,6 +614,7 @@
     }
     if( minlen > pktlen ) {
 	log_error("packet with S2K %d too short\n", s2kmode );
+        rc = G10ERR_INVALID_PACKET;
 	goto leave;
     }
     seskeylen = pktlen - minlen;
@@ -647,24 +651,27 @@
 
   leave:
     skip_rest(inp, pktlen);
-    return 0;
+    return rc;
 }
 
 static int
 parse_pubkeyenc( IOBUF inp, int pkttype, unsigned long pktlen, PACKET *packet )
 {
-    unsigned n;
+    unsigned int n;
+    int rc = 0;
     int i, ndata;
     PKT_pubkey_enc *k;
 
     k = packet->pkt.pubkey_enc = m_alloc_clear(sizeof *packet->pkt.pubkey_enc);
     if( pktlen < 12 ) {
 	log_error("packet(%d) too short\n", pkttype);
+        rc = G10ERR_INVALID_PACKET;
 	goto leave;
     }
     k->version = iobuf_get_noeof(inp); pktlen--;
     if( k->version != 2 && k->version != 3 ) {
 	log_error("packet(%d) with unknown version %d\n", pkttype, k->version);
+        rc = G10ERR_INVALID_PACKET;
 	goto leave;
     }
     k->keyid[0] = read_32(inp); pktlen -= 4;
@@ -696,7 +703,7 @@
 
   leave:
     skip_rest(inp, pktlen);
-    return 0;
+    return rc;
 }
 
 
@@ -849,8 +856,8 @@
 		printf("%02X", buffer[i] );
 	}
         break;
-      case SIGSUBPKT_PRIV_ADD_SIG:
-	p = "signs additional user ID";
+      case SIGSUBPKT_PRIV_VERIFY_CACHE:
+	p = "verification cache";
 	break;
       default: p = "?"; break;
     }
@@ -874,6 +881,8 @@
 	if( n < 4 )
 	    break;
 	return 0;
+      case SIGSUBPKT_KEY_FLAGS:
+          return 0;  
       case SIGSUBPKT_EXPORTABLE:
 	if( !n )
 	    break;
@@ -895,13 +904,21 @@
       case SIGSUBPKT_PREF_COMPR:
       case SIGSUBPKT_POLICY:
 	return 0;
-      case SIGSUBPKT_PRIV_ADD_SIG:
-	/* because we use private data, we check the GNUPG marker */
-	if( n < 24 )
+      case SIGSUBPKT_PRIMARY_UID:
+          if ( n != 1 )
+              break;
+          return 0;   
+      case SIGSUBPKT_PRIV_VERIFY_CACHE:
+        /* "GPG" 0x00 <mode> <stat>
+         * where mode == 1: valid data, stat == 0: invalid signature
+         * stat == 1: valid signature 
+	 * (because we use private data, we check our marker) */
+	if( n < 6 )
 	    break;
-	if( buffer[0] != 'G' || buffer[1] != 'P' || buffer[2] != 'G' )
+	if( buffer[0] != 'G' || buffer[1] != 'P'
+            || buffer[2] != 'G' || buffer[3] )
 	    return -2;
-	return 3;
+	return 4;
       default: return -1;
     }
     return -3;
@@ -925,6 +942,8 @@
       case SIGSUBPKT_PREF_SYM:
       case SIGSUBPKT_PREF_HASH:
       case SIGSUBPKT_PREF_COMPR:
+      case SIGSUBPKT_KEY_FLAGS:
+      case SIGSUBPKT_PRIMARY_UID:
 	return 1;
 
       case SIGSUBPKT_POLICY: /* Is it enough to show the policy? */
@@ -1077,6 +1096,7 @@
 	is_v4=1;
     else if( sig->version != 2 && sig->version != 3 ) {
 	log_error("packet(%d) with unknown version %d\n", pkttype, sig->version);
+        rc = G10ERR_INVALID_PACKET;
 	goto leave;
     }
 
@@ -1212,14 +1232,17 @@
 					     PKT_onepass_sig *ops )
 {
     int version;
+    int rc = 0;
 
     if( pktlen < 13 ) {
 	log_error("packet(%d) too short\n", pkttype);
+        rc = G10ERR_INVALID_PACKET;
 	goto leave;
     }
     version = iobuf_get_noeof(inp); pktlen--;
     if( version != 3 ) {
 	log_error("onepass_sig with unknown version %d\n", version);
+        rc = G10ERR_INVALID_PACKET;
 	goto leave;
     }
     ops->sig_class = iobuf_get_noeof(inp); pktlen--;
@@ -1238,7 +1261,7 @@
 
   leave:
     skip_rest(inp, pktlen);
-    return 0;
+    return rc;
 }
 
 
@@ -1278,11 +1301,13 @@
 	is_v4=1;
     else if( version != 2 && version != 3 ) {
 	log_error("packet(%d) with unknown version %d\n", pkttype, version);
+        rc = G10ERR_INVALID_PACKET;
 	goto leave;
     }
 
     if( pktlen < 11 ) {
 	log_error("packet(%d) too short\n", pkttype);
+        rc = G10ERR_INVALID_PACKET;
 	goto leave;
     }
 
@@ -1316,6 +1341,7 @@
 	sk->version = version;
 	sk->is_primary = pkttype == PKT_SECRET_KEY;
 	sk->pubkey_algo = algorithm;
+	sk->req_usage = 0; 
 	sk->pubkey_usage = 0; /* not yet used */
     }
     else {
@@ -1326,7 +1352,9 @@
 	pk->hdrbytes	= hdrlen;
 	pk->version	= version;
 	pk->pubkey_algo = algorithm;
+	pk->req_usage = 0; 
 	pk->pubkey_usage = 0; /* not yet used */
+        pk->is_revoked = 0;
 	pk->keyid[0] = 0;
 	pk->keyid[1] = 0;
     }
@@ -1558,6 +1586,12 @@
     packet->pkt.user_id->len = pktlen;
     packet->pkt.user_id->photo = NULL;
     packet->pkt.user_id->photolen = 0;
+    packet->pkt.user_id->is_primary = 0;
+    packet->pkt.user_id->is_revoked = 0;
+    packet->pkt.user_id->created = 0;
+    packet->pkt.user_id->help_key_usage = 0;
+    packet->pkt.user_id->help_key_expire = 0;
+
     p = packet->pkt.user_id->name;
     for( ; pktlen; pktlen--, p++ )
 	*p = iobuf_get_noeof(inp);
@@ -1566,7 +1600,7 @@
     if( list_mode ) {
 	int n = packet->pkt.user_id->len;
 	printf(":user ID packet: \"");
-	/* fixme: Hey why don't we replace this wioth print_string?? */
+	/* fixme: Hey why don't we replace this with print_string?? */
 	for(p=packet->pkt.user_id->name; n; p++, n-- ) {
 	    if( *p >= ' ' && *p <= 'z' )
 		putchar(*p);
@@ -1649,6 +1683,7 @@
 parse_plaintext( IOBUF inp, int pkttype, unsigned long pktlen,
 					PACKET *pkt, int new_ctb )
 {
+    int rc = 0;
     int mode, namelen;
     PKT_plaintext *pt;
     byte *p;
@@ -1656,6 +1691,7 @@
 
     if( pktlen && pktlen < 6 ) {
 	log_error("packet(%d) too short (%lu)\n", pkttype, (ulong)pktlen);
+        rc = G10ERR_INVALID_PACKET;
 	goto leave;
     }
     mode = iobuf_get_noeof(inp); if( pktlen ) pktlen--;
@@ -1695,7 +1731,7 @@
     }
 
   leave:
-    return 0;
+    return rc;
 }
 
 
@@ -1724,10 +1760,18 @@
 parse_encrypted( IOBUF inp, int pkttype, unsigned long pktlen,
 				       PACKET *pkt, int new_ctb )
 {
+    int rc = 0;
     PKT_encrypted *ed;
+    unsigned long orig_pktlen = pktlen;
 
     ed = pkt->pkt.encrypted =  m_alloc(sizeof *pkt->pkt.encrypted );
     ed->len = pktlen;
+    /* we don't know the extralen which is (cipher_blocksize+2)
+       because the algorithm ist not specified in this packet.
+       However, it is only important to know this for somesanity
+       checks on the pkacet length - it doesn't matter that we can't
+       do it */
+    ed->extralen = 0;
     ed->buf = NULL;
     ed->new_ctb = new_ctb;
     ed->mdc_method = 0;
@@ -1735,23 +1779,27 @@
 	/* fixme: add some pktlen sanity checks */
 	int version;
 
-	version = iobuf_get_noeof(inp); pktlen--;
+	version = iobuf_get_noeof(inp); 
+        if (orig_pktlen)
+            pktlen--;
 	if( version != 1 ) {
 	    log_error("encrypted_mdc packet with unknown version %d\n",
 								version);
             /*skip_rest(inp, pktlen); should we really do this? */
+            rc = G10ERR_INVALID_PACKET;
 	    goto leave;
 	}
 	ed->mdc_method = DIGEST_ALGO_SHA1;
     }
-    if( pktlen && pktlen < 10 ) { /* actually this is blocksize+2 */
+    if( orig_pktlen && pktlen < 10 ) { /* actually this is blocksize+2 */
 	log_error("packet(%d) too short\n", pkttype);
+        rc = G10ERR_INVALID_PACKET;
 	skip_rest(inp, pktlen);
 	goto leave;
     }
     if( list_mode ) {
-	if( pktlen )
-	    printf(":encrypted data packet:\n\tlength: %lu\n", pktlen);
+	if( orig_pktlen )
+	    printf(":encrypted data packet:\n\tlength: %lu\n", orig_pktlen);
 	else
 	    printf(":encrypted data packet:\n\tlength: unknown\n");
 	if( ed->mdc_method )
@@ -1762,7 +1810,7 @@
     pktlen = 0;
 
   leave:
-    return 0;
+    return rc;
 }
 
 
@@ -1770,6 +1818,7 @@
 parse_mdc( IOBUF inp, int pkttype, unsigned long pktlen,
 				   PACKET *pkt, int new_ctb )
 {
+    int rc = 0;
     PKT_mdc *mdc;
     byte *p;
 
@@ -1778,6 +1827,7 @@
 	printf(":mdc packet: length=%lu\n", pktlen);
     if( !new_ctb || pktlen != 20 ) {
 	log_error("mdc_packet with invalid encoding\n");
+        rc = G10ERR_INVALID_PACKET;
 	goto leave;
     }
     p = mdc->hash;
@@ -1785,7 +1835,7 @@
 	*p = iobuf_get_noeof(inp);
 
   leave:
-    return 0;
+    return rc;
 }
 
 
@@ -1796,7 +1846,7 @@
  * we first check that tehre is a unique tag in it.
  * The format of such a control packet is:
  *   n byte  session marker
- *   1 byte  control type: 1 = Clearsign hash info
+ *   1 byte  control type CTRLPKT_xxxxx
  *   m byte  control data
  */
 
@@ -1848,6 +1898,27 @@
     }
     skip_rest(inp,pktlen);
     return G10ERR_INVALID_PACKET;
+}
+
+/* create a gpg control packet to be used internally as a placeholder */
+PACKET *
+create_gpg_control( ctrlpkttype_t type, const byte *data, size_t datalen )
+{
+    PACKET *packet;
+    byte *p;
+
+    packet = m_alloc( sizeof *packet );
+    init_packet(packet);
+    packet->pkttype = PKT_GPG_CONTROL;
+    packet->pkt.gpg_control = m_alloc(sizeof *packet->pkt.gpg_control
+                                      + datalen - 1);
+    packet->pkt.gpg_control->control = type;
+    packet->pkt.gpg_control->datalen = datalen;
+    p = packet->pkt.gpg_control->data;
+    for( ; datalen; datalen--, p++ )
+	*p = *data++;
+
+    return packet;
 }
 
 
diff -urN gnupg-1.0.4/g10/passphrase.c gnupg-1.0.5/g10/passphrase.c
--- gnupg-1.0.4/g10/passphrase.c	Tue Sep  5 17:12:29 2000
+++ gnupg-1.0.5/g10/passphrase.c	Thu Mar  8 15:08:01 2001
@@ -1,5 +1,5 @@
 /* passphrase.c -  Get a passphrase
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -19,11 +19,18 @@
  */
 
 #include <config.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <assert.h>
+#ifndef HAVE_DOSISH_SYSTEM
+#include <sys/socket.h>
+#include <sys/un.h>
+#endif
+#include <errno.h>
+
 #include "util.h"
 #include "memory.h"
 #include "options.h"
@@ -34,6 +41,43 @@
 #include "i18n.h"
 #include "status.h"
 
+
+enum gpga_protocol_codes {
+    /* Request codes */
+    GPGA_PROT_GET_VERSION     = 1,
+    GPGA_PROT_GET_PASSPHRASE  = 2,
+    GPGA_PROT_CLEAR_PASSPHRASE= 3,
+    GPGA_PROT_SHUTDOWN        = 4,
+    GPGA_PROT_FLUSH           = 5,
+
+    /* Reply codes */
+    GPGA_PROT_REPLY_BASE     = 0x10000,
+    GPGA_PROT_OKAY           = 0x10001,
+    GPGA_PROT_GOT_PASSPHRASE = 0x10002,
+
+    /* Error codes */
+    GPGA_PROT_ERROR_BASE     = 0x20000,
+    GPGA_PROT_PROTOCOL_ERROR = 0x20001,
+    GPGA_PROT_INVALID_REQUEST= 0x20002,
+    GPGA_PROT_CANCELED       = 0x20003,    
+    GPGA_PROT_NO_PASSPHRASE  = 0x20004,    
+    GPGA_PROT_BAD_PASSPHRASE = 0x20005,
+    GPGA_PROT_INVALID_DATA   = 0x20006,
+    GPGA_PROT_NOT_IMPLEMENTED= 0x20007,
+    GPGA_PROT_UI_PROBLEM     = 0x20008,
+};
+
+
+#define buftou32( p )  ((*(byte*)(p) << 24) | (*((byte*)(p)+1)<< 16) | \
+		       (*((byte*)(p)+2) << 8) | (*((byte*)(p)+3)))
+#define u32tobuf( p, a ) do { 			                \
+			    ((byte*)p)[0] = (byte)((a) >> 24);	\
+			    ((byte*)p)[1] = (byte)((a) >> 16);	\
+			    ((byte*)p)[2] = (byte)((a) >>  8);	\
+			    ((byte*)p)[3] = (byte)((a) 	    );	\
+			} while(0)
+
+
 static char *fd_passwd = NULL;
 static char *next_pw = NULL;
 static char *last_pw = NULL;
@@ -43,6 +87,8 @@
 int
 have_static_passphrase()
 {
+    if ( opt.use_agent )
+        return 0;
     return !!fd_passwd;
 }
 
@@ -81,6 +127,9 @@
     int i, len;
     char *pw;
 
+    if ( opt.use_agent ) 
+        return;  /* not used here */
+
     if( !opt.batch )
 	tty_printf("Reading passphrase from file descriptor %d ...", fd );
     for( pw = NULL, i = len = 100; ; i++ ) {
@@ -104,6 +153,341 @@
     fd_passwd = pw;
 }
 
+#ifndef HAVE_DOSISH_SYSTEM
+static int
+writen ( int fd, const void *buf, size_t nbytes )
+{
+    size_t nleft = nbytes;
+    ssize_t nwritten;
+
+    while( nleft > 0 ) {
+        nwritten = write( fd, buf, nleft );
+        if( nwritten < 0 ) {
+            if ( errno == EINTR )
+                nwritten = 0;
+            else {
+                log_error ( "writen() failed: %s\n", strerror (errno) );
+                return -1;
+            }
+        }
+        nleft -= nwritten;
+        buf = (const char*)buf + nwritten;
+    }
+    return 0;
+}
+
+
+static int
+readn ( int fd, void *buf, size_t buflen, size_t *ret_nread )
+{
+    size_t nleft = buflen;
+    int nread;
+    char *p;
+
+    p = buf;
+    while( nleft > 0 ) {
+        nread = read ( fd, buf, nleft );
+        if( nread < 0 ) {
+            if (nread == EINTR)
+                nread = 0;
+            else {
+                log_error ( "read() error: %s\n", strerror (errno) );
+                return -1;
+            }
+        }
+        else if( !nread )
+            break; /* EOF */
+        nleft -= nread;
+        buf = (char*)buf + nread;
+    }
+    if( ret_nread )
+        *ret_nread = buflen - nleft;
+    return 0;
+}
+
+/*
+ * Open a connection to the agent and send the magic string
+ * Returns: -1 on error or an filedescriptor for urther processing
+ */
+
+static int
+agent_open ()
+{
+    int fd;
+    char *infostr, *p;
+    struct sockaddr_un client_addr;
+    size_t len;
+
+    infostr = getenv ( "GPG_AGENT_INFO" );
+    if ( !infostr ) {
+        log_error (_("gpg-agent is not available in this session\n"));
+        return -1;
+    }
+    infostr = m_strdup ( infostr );
+    if ( !(p = strchr ( infostr, ':')) || p == infostr
+         || (p-infostr)+1 >= sizeof client_addr.sun_path ) {
+        log_error (_("malformed GPG_AGENT_INFO environment variable\n"));
+        m_free (infostr );
+        return -1;
+    }
+    *p = 0;
+        
+    if( (fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1 ) {
+        log_error ("can't create socket: %s\n", strerror(errno) );
+        m_free (infostr );
+        return -1;
+    }
+
+    memset( &client_addr, 0, sizeof client_addr );
+    client_addr.sun_family = AF_UNIX;
+    strcpy( client_addr.sun_path, infostr );
+    len = offsetof (struct sockaddr_un, sun_path)
+        + strlen(client_addr.sun_path) + 1;
+    
+    if( connect( fd, (struct sockaddr*)&client_addr, len ) == -1 ) {
+        log_error ( _("can't connect to `%s': %s\n"), 
+                    infostr, strerror (errno) );
+        m_free (infostr );
+        close (fd );
+        return -1;
+    }
+    m_free (infostr);
+
+    if ( writen ( fd, "GPGA\0\0\0\x01", 8 ) ) {
+        close (fd);
+        fd = -1;
+    }
+    return fd;
+}
+
+static void
+agent_close ( int fd )
+{
+    close (fd);
+}
+#endif /* !HAVE_DOSISH_SYSTEM */
+
+
+/*
+ * Ask the GPG Agent for the passphrase.
+ * Mode 0:  Allow cached passphrase
+ *      1:  No cached passphrase FIXME: Not really implemented
+ *      2:  Ditto, but change the text to "repeat entry"
+ */
+static char *
+agent_get_passphrase ( u32 *keyid, int mode )
+{
+  #ifdef HAVE_DOSISH_SYSTEM
+    return NULL;
+  #else
+  
+    size_t n;
+    char *atext;
+    char buf[50];
+    int fd = -1;
+    int nread;
+    u32 reply;
+    char *pw = NULL;
+    PKT_public_key *pk = m_alloc_clear( sizeof *pk );
+    byte fpr[MAX_FINGERPRINT_LEN];
+
+#if MAX_FINGERPRINT_LEN < 20
+  #error agent needs a 20 byte fingerprint
+#endif
+
+    memset (fpr, 0, MAX_FINGERPRINT_LEN );
+    if( keyid && get_pubkey( pk, keyid ) )
+        pk = NULL; /* oops: no key for some reason */
+
+    if ( !mode && pk ) { 
+        char *uid;
+        size_t uidlen;
+        const char *algo_name = pubkey_algo_to_string ( pk->pubkey_algo );
+        const char *timestr;
+        char *maink;
+        const char *fmtstr;
+     
+        if ( !algo_name )
+            algo_name = "?";
+   
+        fmtstr = _(" (main key ID %08lX)");
+        maink = m_alloc ( strlen (fmtstr) + 20 );
+        if( keyid[2] && keyid[3] && keyid[0] != keyid[2] 
+            && keyid[1] != keyid[3] )
+            sprintf( maink, fmtstr, (ulong)keyid[3] );
+        else
+            *maink = 0;
+
+        uid = get_user_id( keyid, &uidlen ); 
+        timestr = strtimestamp (pk->timestamp);
+        fmtstr = _("You need a passphrase to unlock the"
+                   " secret key for user:\n"
+                   "\"%.*s\"\n"
+                   "%u-bit %s key, ID %08lX, created %s%s\n" );
+        atext = m_alloc ( 100 + strlen (fmtstr)  
+                               + uidlen + 15 + strlen(algo_name) + 8
+                               + strlen (timestr) + strlen (maink) );
+        sprintf (atext, fmtstr,
+                 uidlen, uid,
+                 nbits_from_pk (pk), algo_name, (ulong)keyid[1], timestr,
+                 maink  );
+        m_free (uid);
+        m_free (maink);
+
+        { 
+            size_t dummy;
+            fingerprint_from_pk( pk, fpr, &dummy );
+        }
+        
+    }
+    else if (mode == 1 ) 
+        atext = m_strdup ( _("Enter passphrase\n") );
+    else 
+        atext = m_strdup ( _("Repeat passphrase\n") );
+
+        
+        
+    if ( (fd = agent_open ()) == -1 ) 
+        goto failure;
+
+
+    n = 4 + 20 + strlen (atext);
+    u32tobuf (buf, n );
+    u32tobuf (buf+4, GPGA_PROT_GET_PASSPHRASE );
+    memcpy (buf+8, fpr, 20 );
+    if ( writen ( fd, buf, 28 ) || writen ( fd, atext, strlen (atext) ) ) 
+        goto failure;
+    m_free (atext); atext = NULL;
+
+    /* get response */
+    if ( readn ( fd, buf, 12, &nread ) ) 
+        goto failure;
+
+    if ( nread < 8 ) {
+        log_error ( "response from agent too short\n" );
+        goto failure;
+    }
+    n = buftou32 ( buf );
+    reply = buftou32 ( buf + 4 );
+    if ( reply == GPGA_PROT_GOT_PASSPHRASE ) {
+        size_t pwlen;
+        size_t nn;
+
+        if ( nread < 12 || n < 8 ) {
+            log_error ( "response from agent too short\n" );
+            goto failure;
+        }
+        pwlen = buftou32 ( buf + 8 );
+        nread -= 12;
+        n -= 8;
+        if ( pwlen > n || n > 1000 ) {
+            log_error (_("passphrase too long\n"));
+            /* or protocol error */
+            goto failure;
+        }
+        /* we read the whole block in one chunk to give no hints
+         * on how long the passhrase actually is - this wastes some bytes
+         * but because we already have this padding we should not loosen
+         * this by issuing 2 read calls */
+        pw = m_alloc_secure ( n+1 );
+        if ( readn ( fd, pw, n, &nn ) )
+            goto failure;
+        if ( n != nn ) {
+            log_error (_("invalid response from agent\n"));
+            goto failure;           
+        }
+        pw[pwlen] = 0; /* make a C String */
+        agent_close (fd);
+        free_public_key( pk );
+        return pw;
+    }
+    else if ( reply == GPGA_PROT_CANCELED ) {
+        log_info ( _("cancelled by user\n") );
+    }
+    else {
+        log_error ( _("problem with the agent: agent returns 0x%lx\n"),
+                      (ulong)reply );
+    }
+        
+        
+  failure:
+    m_free (atext);
+    if ( fd != -1 )
+        agent_close (fd);
+    m_free (pw );
+    free_public_key( pk );
+
+    return NULL;
+  #endif
+}
+
+/*
+ * Clear the cached passphrase
+ */
+void
+passphrase_clear_cache ( u32 *keyid, int algo )
+{
+  #ifdef HAVE_DOSISH_SYSTEM
+    return ;
+  #else
+    size_t n;
+    char buf[50];
+    int fd = -1;
+    int nread;
+    u32 reply;
+    PKT_public_key *pk = m_alloc_clear ( sizeof *pk );
+    byte fpr[MAX_FINGERPRINT_LEN];
+    
+#if MAX_FINGERPRINT_LEN < 20
+#error agent needs a 20 byte fingerprint
+#endif
+    
+    memset (fpr, 0, MAX_FINGERPRINT_LEN );
+    if( !keyid || get_pubkey( pk, keyid ) ) {
+        log_debug ("oops, no key in passphrase_clear_cache\n");
+        goto failure; /* oops: no key for some reason */
+    }
+    
+    {
+        size_t dummy;
+        fingerprint_from_pk( pk, fpr, &dummy );
+    }
+    
+    if ( (fd = agent_open ()) == -1 ) 
+        goto failure;
+    
+    n = 4 + 20;
+    u32tobuf (buf, n );
+    u32tobuf (buf+4, GPGA_PROT_CLEAR_PASSPHRASE );
+    memcpy (buf+8, fpr, 20 );
+    if ( writen ( fd, buf, 28 ) )  
+        goto failure;
+    
+    /* get response */
+    if ( readn ( fd, buf, 8, &nread ) ) 
+        goto failure;
+    
+    if ( nread < 8 ) {
+        log_error ( "response from agent too short\n" );
+        goto failure;
+    }
+    
+    reply = buftou32 ( buf + 4 );
+    if ( reply != GPGA_PROT_OKAY && reply != GPGA_PROT_NO_PASSPHRASE ) {
+        log_error ( _("problem with the agent: agent returns 0x%lx\n"),
+                    (ulong)reply );
+    }
+        
+        
+  failure:
+    if ( fd != -1 )
+        agent_close (fd);
+    free_public_key( pk );
+  #endif
+}
+
+
+
 
 /****************
  * Get a passphrase for the secret key with KEYID, display TEXT
@@ -125,24 +509,43 @@
     STRING2KEY help_s2k;
 
     if( !s2k ) {
+        int def_algo;
+
 	s2k = &help_s2k;
 	s2k->mode = 0;
-	/* this should be MD5 if cipher is IDEA, but because we do
-	 * not have IDEA, we use the default one, the user
-	 * can select it from the commandline
-	 */
-	s2k->hash_algo = opt.def_digest_algo?opt.def_digest_algo
-					    :DEFAULT_DIGEST_ALGO;
+	/* If we have IDEA installed we use MD5 otherwise the default
+	 * hash algorithm.  This can always be overriden from the
+	 * commandline */
+        def_algo = check_cipher_algo (CIPHER_ALGO_IDEA)?
+                                    DEFAULT_DIGEST_ALGO : DIGEST_ALGO_MD5;
+	s2k->hash_algo = opt.def_digest_algo? opt.def_digest_algo : def_algo;
     }
 
     if( !next_pw && is_status_enabled() ) {
 	char buf[50];
+
 	if( keyid ) {
-	    sprintf( buf, "%08lX%08lX", (ulong)keyid[0], (ulong)keyid[1] );
-	    if( keyid[2] && keyid[3] && keyid[0] != keyid[2]
-				     && keyid[1] != keyid[3] )
-		sprintf( buf+strlen(buf), " %08lX%08lX %d 0",
-			   (ulong)keyid[2], (ulong)keyid[3], pubkey_algo );
+            u32 used_kid[2];
+            char *us;
+
+	    if( keyid[2] && keyid[3] ) {
+                used_kid[0] = keyid[2];
+                used_kid[1] = keyid[3];
+            }
+            else {
+                used_kid[0] = keyid[0];
+                used_kid[1] = keyid[1];
+            }
+
+            us = get_long_user_id_string( keyid );
+            write_status_text( STATUS_USERID_HINT, us );
+            m_free(us);
+
+	    sprintf( buf, "%08lX%08lX %08lX%08lX %d 0",
+                     (ulong)keyid[0], (ulong)keyid[1],
+                     (ulong)used_kid[0], (ulong)used_kid[1],
+                     pubkey_algo );
+                     
 	    write_status_text( STATUS_NEED_PASSPHRASE, buf );
 	}
 	else {
@@ -181,6 +584,22 @@
     if( next_pw ) {
 	pw = next_pw;
 	next_pw = NULL;
+    }
+    else if ( opt.use_agent ) {
+	pw = agent_get_passphrase ( keyid, mode == 2? 1: 0 );
+        if ( !pw )
+            pw = m_strdup ("");
+        if( *pw && mode == 2 ) {
+	    char *pw2 = agent_get_passphrase ( keyid, 2 );
+            if ( !pw2 )
+                pw2 = m_strdup ("");
+	    if( strcmp(pw, pw2) ) {
+		m_free(pw2);
+		m_free(pw);
+		return NULL;
+	    }
+	    m_free(pw2);
+	}
     }
     else if( fd_passwd ) {
 	pw = m_alloc_secure( strlen(fd_passwd)+1 );
diff -urN gnupg-1.0.4/g10/pipemode.c gnupg-1.0.5/g10/pipemode.c
--- gnupg-1.0.4/g10/pipemode.c	Thu Jan  1 01:00:00 1970
+++ gnupg-1.0.5/g10/pipemode.c	Thu Apr  5 12:00:04 2001
@@ -0,0 +1,317 @@
+/* pipemode.c - pipemode handler
+ * Copyright (C) 1998, 1990, 2000, 2001 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <config.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <assert.h>
+
+#include "options.h"
+#include "packet.h"
+#include "errors.h"
+#include "iobuf.h"
+#include "keydb.h"
+#include "memory.h"
+#include "util.h"
+#include "main.h"
+#include "status.h"
+#include "filter.h"
+
+
+#define CONTROL_PACKET_SPACE 30 
+#define FAKED_LITERAL_PACKET_SPACE (9+2+2)
+
+
+enum pipemode_state_e {
+    STX_init = 0,
+    STX_wait_operation,
+    STX_begin,
+    STX_text,
+    STX_detached_signature,
+    STX_detached_signature_wait_text,
+    STX_signed_data,
+    STX_wait_init
+};
+
+struct pipemode_context_s {
+    enum pipemode_state_e state;
+    int operation;
+    int stop;
+    int block_mode;
+    UnarmorPump unarmor_ctx;
+};
+
+
+static size_t
+make_control ( byte *buf, int code, int operation )
+{
+    const byte *sesmark;
+    size_t sesmarklen, n=0;;
+
+    sesmark = get_session_marker( &sesmarklen );
+    if ( sesmarklen > 20 )
+        BUG();
+
+    buf[n++] = 0xff; /* new format, type 63, 1 length byte */
+    n++;   /* length will fixed below */
+    memcpy(buf+n, sesmark, sesmarklen ); n+= sesmarklen;
+    buf[n++] = CTRLPKT_PIPEMODE;    
+    buf[n++] = code;
+    buf[n++] = operation;
+    buf[1] = n-2;
+    return n;
+}
+
+
+
+static int
+pipemode_filter( void *opaque, int control,
+	         IOBUF a, byte *buf, size_t *ret_len)
+{ 
+    size_t size = *ret_len;
+    struct pipemode_context_s *stx = opaque;
+    int rc=0;
+    size_t n = 0;
+    int esc = 0;
+
+    if( control == IOBUFCTRL_UNDERFLOW ) {
+        *ret_len = 0;
+        /* reserve some space for one control packet */
+        if ( size <= CONTROL_PACKET_SPACE+FAKED_LITERAL_PACKET_SPACE )
+            BUG();
+        size -= CONTROL_PACKET_SPACE+FAKED_LITERAL_PACKET_SPACE;
+
+        if ( stx->block_mode ) {
+            /* reserve 2 bytes for the block length */
+            buf[n++] = 0;
+            buf[n++] = 0;
+        }
+            
+
+        while ( n < size ) {
+            /* FIXME: we have to make sure that we have a large enough
+             * buffer for a control packet even after we already read 
+             * something. The easest way to do this is probably by ungetting
+             * the control sequence and returning the buffer we have
+             * already assembled */
+            int c = iobuf_get (a);
+            if (c == -1) {
+                if ( stx->state != STX_init ) {
+                    log_error ("EOF encountered at wrong state\n");
+                    stx->stop = 1;
+                    return -1;
+                }
+                break;
+            }
+            if ( esc ) {
+                switch (c) {
+                  case '@':  
+                    if ( stx->state == STX_text ) {
+                        buf[n++] = c;
+                        break;
+                    }
+                    else if ( stx->state == STX_detached_signature ) {
+                        esc = 0;
+                        goto do_unarmor; /* not a very elegant solution */
+                    }
+                    else if ( stx->state == STX_detached_signature_wait_text) {
+                        esc = 0;
+                        break; /* just ignore it in this state */
+                    }
+                    log_error ("@@ not allowed in current state\n");
+                    return -1;
+                  case '<': /* begin of stream part */
+                    if ( stx->state != STX_init ) {
+                        log_error ("nested begin of stream\n");
+                        stx->stop = 1;
+                        return -1;
+                    }
+                    stx->state = STX_wait_operation;
+                    stx->block_mode = 0;
+                    unarmor_pump_release (stx->unarmor_ctx);
+                    stx->unarmor_ctx = NULL;
+                    break;
+                   case '>': /* end of stream part */
+                     if ( stx->state != STX_wait_init ) {
+                        log_error ("invalid state for @>\n");
+                        stx->stop = 1;
+                        return -1;
+                    }
+                    stx->state = STX_init;
+                    break;
+                  case 'V': /* operation = verify */
+                  case 'E': /* operation = encrypt */
+                  case 'S': /* operation = sign */
+                  case 'B': /* operation = detach sign */
+                  case 'C': /* operation = clearsign */
+                  case 'D': /* operation = decrypt */
+                    if ( stx->state != STX_wait_operation ) {
+                        log_error ("invalid state for operation code\n");
+                        stx->stop = 1;
+                        return -1;
+                    }
+                    stx->operation = c;
+                    if ( stx->operation == 'B') {
+                        stx->state = STX_detached_signature;
+                        if ( !opt.no_armor )
+                            stx->unarmor_ctx = unarmor_pump_new ();
+                    }
+                    else
+                        stx->state = STX_begin;
+                    n += make_control ( buf+n, 1, stx->operation );
+                    /* must leave after a control packet */
+                    goto leave;
+
+                  case 't': /* plaintext text follows */
+                    if ( stx->state == STX_detached_signature_wait_text ) 
+                        stx->state = STX_detached_signature;
+                    if ( stx->state == STX_detached_signature ) {
+                        if ( stx->operation != 'B' ) {
+                            log_error ("invalid operation for this state\n");
+                            stx->stop = 1;
+                            return -1;
+                        }
+                        stx->state = STX_signed_data;
+                        n += make_control ( buf+n, 2, 'B' );
+                        /* and now we fake a literal data packet much the same
+                         * as in armor.c */
+                        buf[n++] = 0xaf; /* old packet format, type 11,
+                                            var length */
+                        buf[n++] = 0;	 /* set the length header */
+                        buf[n++] = 6;
+                        buf[n++] = 'b';  /* we ignore it anyway */
+                        buf[n++] = 0;	 /* namelength */
+                        memset(buf+n, 0, 4); /* timestamp */
+                        n += 4;
+                        /* and return now so that we are sure to have
+                         * more space in the bufer for the next control
+                         * packet */
+                        stx->block_mode = 1;
+                        goto leave2;
+                    }
+                    else {
+                        log_error ("invalid state for @t\n");
+                        stx->stop = 1;
+                        return -1;
+                    }
+                    break;
+
+                  case '.': /* ready */
+                    if ( stx->state == STX_signed_data ) { 
+                        if (stx->block_mode) {
+                            buf[0] = (n-2) >> 8;
+                            buf[1] = (n-2);
+                            if ( buf[0] || buf[1] ) {
+                                /* end of blocks marker */
+                                buf[n++] = 0;
+                                buf[n++] = 0;
+                            }
+                            stx->block_mode = 0;
+                        }
+                        n += make_control ( buf+n, 3, 'B' );
+                    }
+                    else {
+                        log_error ("invalid state for @.\n");
+                        stx->stop = 1;
+                        return -1;
+                    }
+                    stx->state = STX_wait_init;
+                    goto leave;
+
+                 default:      
+                    log_error ("invalid escape sequence 0x%02x in stream\n",
+                               c);
+                    stx->stop = 1;
+                    return -1;
+                }
+                esc = 0;
+            }
+            else if (c == '@') 
+                esc = 1;
+            else if (stx->unarmor_ctx) {
+          do_unarmor: /* used to handle a @@ */
+                c = unarmor_pump (stx->unarmor_ctx, c);
+                if ( !(c & ~255) )
+                    buf[n++] = c;
+                else if ( c < 0 ) {
+                    /* end of armor or error - we don't care becuase
+                      the armor can be modified anyway.  The unarmored
+                      stuff should stand for itself. */ 
+                    unarmor_pump_release (stx->unarmor_ctx);
+                    stx->unarmor_ctx = NULL;
+                    stx->state = STX_detached_signature_wait_text;
+                }
+            }
+            else if (stx->state == STX_detached_signature_wait_text)
+                ; /* just wait */
+            else
+                buf[n++] = c; 
+        }
+
+      leave:      
+        if ( !n ) {
+            stx->stop = 1;
+            rc = -1; /* eof */
+        }
+        if ( stx->block_mode ) {
+            /* fixup the block length */
+            buf[0] = (n-2) >> 8;
+            buf[1] = (n-2);
+        }
+      leave2:
+        /*log_hexdump ("pipemode:", buf, n );*/
+	*ret_len = n;
+    }
+    else if( control == IOBUFCTRL_DESC )
+	*(char**)buf = "pipemode_filter";
+    return rc;
+}
+
+
+
+void
+run_in_pipemode(void)
+{
+    IOBUF fp;
+    armor_filter_context_t afx;
+    struct pipemode_context_s stx;
+    int rc;
+
+    memset( &afx, 0, sizeof afx);
+    memset( &stx, 0, sizeof stx);
+
+    fp = iobuf_open("-");
+    iobuf_push_filter (fp, pipemode_filter, &stx );
+
+    do {
+        write_status (STATUS_BEGIN_STREAM);
+        rc = proc_packets( NULL, fp );
+        write_status (STATUS_END_STREAM);
+    } while ( !stx.stop );
+  
+}
+
+
+
+
+
+
diff -urN gnupg-1.0.4/g10/pkclist.c gnupg-1.0.5/g10/pkclist.c
--- gnupg-1.0.4/g10/pkclist.c	Fri Sep 15 15:50:59 2000
+++ gnupg-1.0.5/g10/pkclist.c	Sun Apr 22 15:44:56 2001
@@ -1,5 +1,5 @@
 /* pkclist.c
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -483,8 +483,8 @@
 	if( opt.verbose )
 	    log_info("No trust check due to --always-trust option\n");
 	/* The problem with this, is that EXPIRE can't be checked as
-	 * this needs to insert a ne key into the trustdb first and
-	 * we don't want that */
+	 * this needs to insert a new key into the trustdb first and
+	 * we don't want that - IS this still true? */
 	return 1;
     }
 
@@ -813,13 +813,12 @@
 	    any_recipients = 1;
 	else if( (use & PUBKEY_USAGE_ENC) && !opt.no_encrypt_to ) {
 	    pk = m_alloc_clear( sizeof *pk );
-	    pk->pubkey_usage = use;
+	    pk->req_usage = use;
 	    if( (rc = get_pubkey_byname( NULL, pk, rov->d, NULL )) ) {
 		free_public_key( pk ); pk = NULL;
 		log_error(_("%s: skipped: %s\n"), rov->d, g10_errstr(rc) );
 	    }
 	    else if( !(rc=check_pubkey_algo2(pk->pubkey_algo, use )) ) {
-
 		/* Skip the actual key if the key is already present
 		 * in the list */
 		if (key_present_in_pk_list(pk_list, pk) == 0) {
@@ -870,7 +869,7 @@
 	    if( pk )
 		free_public_key( pk );
 	    pk = m_alloc_clear( sizeof *pk );
-	    pk->pubkey_usage = use;
+	    pk->req_usage = use;
 	    rc = get_pubkey_byname( NULL, pk, answer, NULL );
 	    if( rc )
 		tty_printf(_("No such user ID.\n"));
@@ -936,7 +935,7 @@
     }
     else if( !any_recipients && (def_rec = default_recipient()) ) {
 	pk = m_alloc_clear( sizeof *pk );
-	pk->pubkey_usage = use;
+	pk->req_usage = use;
 	rc = get_pubkey_byname( NULL, pk, def_rec, NULL );
 	if( rc )
 	    log_error(_("unknown default recipient `%s'\n"), def_rec );
@@ -961,7 +960,7 @@
 		continue; /* encrypt-to keys are already handled */
 
 	    pk = m_alloc_clear( sizeof *pk );
-	    pk->pubkey_usage = use;
+	    pk->req_usage = use;
 	    if( (rc = get_pubkey_byname( NULL, pk, remusr->d, NULL )) ) {
 		free_public_key( pk ); pk = NULL;
 		log_error(_("%s: skipped: %s\n"), remusr->d, g10_errstr(rc) );
diff -urN gnupg-1.0.4/g10/plaintext.c gnupg-1.0.5/g10/plaintext.c
--- gnupg-1.0.4/g10/plaintext.c	Wed Jul 26 11:21:58 2000
+++ gnupg-1.0.5/g10/plaintext.c	Thu Mar 29 10:47:25 2001
@@ -1,5 +1,5 @@
-/* plaintext.c -  process an plaintext packet
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+/* plaintext.c -  process plaintext packets
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -89,9 +89,17 @@
 	setmode ( fileno(fp) , O_BINARY );
       #endif
     }
-    else if( !overwrite_filep( fname ) ) {
-	rc = G10ERR_CREATE_FILE;
-	goto leave;
+    else {
+	while( !overwrite_filep (fname) ) {
+            char *tmp = ask_outfile_name (NULL, 0);
+            if ( !tmp || !*tmp ) {
+                m_free (tmp);
+                rc = G10ERR_CREATE_FILE;
+                goto leave;
+            }
+            m_free (fname);
+            fname = tmp;
+        }
     }
 
     if( fp || nooutput )
@@ -370,7 +378,7 @@
 		const char *sigfilename, int textmode )
 {
     IOBUF fp;
-    STRLIST sl=NULL;
+    STRLIST sl;
 
     if( !files ) {
 	/* check whether we can open the signed material */
@@ -380,28 +388,26 @@
 	    iobuf_close(fp);
 	    return 0;
 	}
-	/* no we can't (no sigfile) - read signed stuff from stdin */
-	add_to_strlist( &sl, "-");
+        log_error (_("no signed data\n"));
+        return G10ERR_OPEN_FILE;
     }
-    else
-	sl = files;
 
-    for( ; sl; sl = sl->next ) {
+
+    for (sl=files; sl; sl = sl->next ) {
 	fp = iobuf_open( sl->d );
 	if( !fp ) {
 	    log_error(_("can't open signed data `%s'\n"),
 						print_fname_stdin(sl->d));
-	    if( !files )
-		free_strlist(sl);
 	    return G10ERR_OPEN_FILE;
 	}
 	do_hash( md, md2, fp, textmode );
 	iobuf_close(fp);
     }
 
-    if( !files )
-	free_strlist(sl);
     return 0;
 }
+
+
+
 
 
diff -urN gnupg-1.0.4/g10/pubkey-enc.c gnupg-1.0.5/g10/pubkey-enc.c
--- gnupg-1.0.4/g10/pubkey-enc.c	Wed Sep  6 16:24:39 2000
+++ gnupg-1.0.5/g10/pubkey-enc.c	Thu Mar  8 15:09:05 2001
@@ -1,5 +1,5 @@
 /* pubkey-enc.c -  public key encoded packet handling
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/g10/revoke.c gnupg-1.0.5/g10/revoke.c
--- gnupg-1.0.4/g10/revoke.c	Tue May  9 09:02:28 2000
+++ gnupg-1.0.5/g10/revoke.c	Thu Mar  8 15:09:12 2001
@@ -1,5 +1,5 @@
 /* revoke.c
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/g10/ringedit.c gnupg-1.0.5/g10/ringedit.c
--- gnupg-1.0.4/g10/ringedit.c	Wed Sep 13 16:05:42 2000
+++ gnupg-1.0.5/g10/ringedit.c	Mon Mar 19 20:10:37 2001
@@ -1,5 +1,5 @@
 /* ringedit.c -  Function for key ring editing
- *	Copyright (C) 1998, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -198,7 +198,7 @@
     char *filename = NULL;
     int rc = 0;
     enum resource_type rt = rt_UNKNOWN;
-
+    const char *created_fname = NULL;
 
     /* Do we have an URL?
      *	gnupg-gdbm:filename  := this is a GDBM resource
@@ -317,12 +317,14 @@
 	      #endif
 		if( !opt.quiet )
 		    log_info(_("%s: keyring created\n"), filename );
+                created_fname = filename;
 	    }
 	}
       #if HAVE_DOSISH_SYSTEM || 1
 	iobuf_close( iobuf );
 	iobuf = NULL;
-	/* must close it again */
+        if (created_fname) /* must invalidate that ugly cache */
+            iobuf_ioctl (NULL, 2, 0, (char*)created_fname);
       #endif
 	break;
 
@@ -1106,7 +1108,7 @@
     int rc;
     PACKET pkt;
     int save_mode;
-    ulong offset;
+    off_t offset;
     int pkttype = req->pkttype;
     PKT_public_key *req_pk = req->pkt.public_key;
     PKT_secret_key *req_sk = req->pkt.secret_key;
@@ -1188,9 +1190,9 @@
     }
 
     if( !kbpos->valid )
-	log_debug("kbpos not valid in keyring_read, want %d\n", (int)kbpos->offset );
+       log_debug("kbpos not valid in keyring_read\n" );
     if( iobuf_seek( a, kbpos->offset ) ) {
-	log_error("can't seek to %lu\n", kbpos->offset);
+       log_error("can't seek\n");
 	iobuf_close(a);
 	return G10ERR_KEYRING_OPEN;
     }
@@ -1529,6 +1531,8 @@
 
     /* rename and make backup file */
     if( !rentry->secret ) {  /* but not for secret keyrings */
+        iobuf_ioctl (NULL, 2, 0, bakfname );
+        iobuf_ioctl (NULL, 2, 0, rentry->fname );
       #ifdef HAVE_DOSISH_SYSTEM
 	remove( bakfname );
       #endif
@@ -1539,6 +1543,8 @@
 	    goto leave;
 	}
     }
+    iobuf_ioctl (NULL, 2, 0, tmpfname );
+    iobuf_ioctl (NULL, 2, 0, rentry->fname );
   #ifdef HAVE_DOSISH_SYSTEM
     remove( rentry->fname );
   #endif
diff -urN gnupg-1.0.4/g10/seckey-cert.c gnupg-1.0.5/g10/seckey-cert.c
--- gnupg-1.0.4/g10/seckey-cert.c	Wed Sep 13 18:12:19 2000
+++ gnupg-1.0.5/g10/seckey-cert.c	Thu Mar  8 15:09:30 2001
@@ -1,5 +1,5 @@
 /* seckey-cert.c -  secret key certificate packet handling
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -63,10 +63,8 @@
 	keyid_from_sk( sk, keyid );
 	keyid[2] = keyid[3] = 0;
 	if( !sk->is_primary ) {
-	    PKT_secret_key *sk2 = m_alloc_clear( sizeof *sk2 );
-	    if( !get_primary_seckey( sk2, keyid ) )
-		keyid_from_sk( sk2, keyid+2 );
-	    free_secret_key( sk2 );
+            keyid[2] = sk->main_keyid[0];
+            keyid[3] = sk->main_keyid[1];
 	}
 	dek = passphrase_to_dek( keyid, sk->pubkey_algo, sk->protect.algo,
 				 &sk->protect.s2k, 0 );
@@ -138,6 +136,7 @@
 	/* now let's see whether we have used the right passphrase */
 	if( csum != sk->csum ) {
 	    copy_secret_key( sk, save_sk );
+            passphrase_clear_cache ( keyid, sk->pubkey_algo );
 	    free_secret_key( save_sk );
 	    return G10ERR_BAD_PASS;
 	}
@@ -145,6 +144,7 @@
 	res = pubkey_check_secret_key( sk->pubkey_algo, sk->skey );
 	if( res ) {
 	    copy_secret_key( sk, save_sk );
+            passphrase_clear_cache ( keyid, sk->pubkey_algo );
 	    free_secret_key( save_sk );
 	    return G10ERR_BAD_PASS;
 	}
diff -urN gnupg-1.0.4/g10/seskey.c gnupg-1.0.5/g10/seskey.c
--- gnupg-1.0.4/g10/seskey.c	Mon Jun  5 23:25:29 2000
+++ gnupg-1.0.5/g10/seskey.c	Thu Mar  8 15:09:38 2001
@@ -1,5 +1,5 @@
 /* seskey.c -  make sesssion keys etc.
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/g10/sig-check.c gnupg-1.0.5/g10/sig-check.c
--- gnupg-1.0.4/g10/sig-check.c	Wed Sep  6 16:37:15 2000
+++ gnupg-1.0.5/g10/sig-check.c	Tue Apr 17 10:03:54 2001
@@ -1,5 +1,5 @@
 /* sig-check.c -  Check a signature
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -321,8 +321,13 @@
     }
 
     if( pk->expiredate && pk->expiredate < cur_time ) {
-	log_info(_("NOTE: signature key expired %s\n"),
-					asctimestamp( pk->expiredate ) );
+        if (opt.verbose) {
+	    u32 tmp_kid[2];
+
+	    keyid_from_pk( pk, tmp_kid );
+            log_info(_("NOTE: signature key %08lX expired %s\n"),
+                     (ulong)tmp_kid[1], asctimestamp( pk->expiredate ) );
+        }
 	write_status(STATUS_SIGEXPIRED);
 	*r_expired = 1;
     }
@@ -432,6 +437,34 @@
     }
 }
 
+static void
+cache_selfsig_result ( PKT_signature *sig, int result )
+{
+    byte buf[6];
+
+    if ( opt.no_sig_cache )
+        return;
+
+    buf[0] = 'G';
+    buf[1] = 'P';
+    buf[2] = 'G';
+    buf[3] = 0;
+    if ( !result ) {
+        buf[4] = 1; /* mark cache valid */
+        buf[5] = 1; /* mark signature valid */
+    }
+    else if ( result == G10ERR_BAD_SIGN ) {
+        buf[4] = 1; /* mark cache valid */
+        buf[5] = 0; /* mark signature invalid */
+    }
+    else {
+        buf[4] = 0; /* mark cache invalid */
+        buf[5] = 0; 
+    }
+
+    build_sig_subpkt (sig, SIGSUBPKT_PRIV_VERIFY_CACHE, buf, 6 );
+}
+
 /****************
  * check the signature pointed to by NODE. This is a key signature.
  * If the function detects a self-signature, it uses the PK from
@@ -472,13 +505,33 @@
 		      sig->flags.valid? "good":"bad" );
   #endif
 
+    /* Check whether we have cached the result of a previous signature check.*/
+    if ( !opt.no_sig_cache ) {
+        const byte *p;
+        size_t len;
+
+        p = parse_sig_subpkt( sig->unhashed_data,
+                              SIGSUBPKT_PRIV_VERIFY_CACHE, &len );
+        if ( p && len >= 2 && p[0] == 1 ) { /* cache hit */
+	    if( is_selfsig ) {	
+		u32 keyid[2];	
+
+		keyid_from_pk( pk, keyid );
+		if( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1] )
+		    *is_selfsig = 1;
+	    }
+            return p[1] == 1? 0 : G10ERR_BAD_SIGN;
+        }
+    }
+
     if( (rc=check_digest_algo(algo)) )
 	return rc;
 
-    if( sig->sig_class == 0x20 ) {
+    if( sig->sig_class == 0x20 ) { /* key revocation */
 	md = md_open( algo, 0 );
 	hash_public_key( md, pk );
 	rc = do_check( pk, sig, md, r_expired );
+        cache_selfsig_result ( sig, rc );
 	md_close(md);
     }
     else if( sig->sig_class == 0x28 ) { /* subkey revocation */
@@ -489,14 +542,15 @@
 	    hash_public_key( md, pk );
 	    hash_public_key( md, snode->pkt->pkt.public_key );
 	    rc = do_check( pk, sig, md, r_expired );
+            cache_selfsig_result ( sig, rc );
 	    md_close(md);
 	}
 	else {
-	    log_error("no subkey for subkey revocation packet\n");
+	    log_info ("no subkey for subkey revocation packet\n");
 	    rc = G10ERR_SIG_CLASS;
 	}
     }
-    else if( sig->sig_class == 0x18 ) {
+    else if( sig->sig_class == 0x18 ) { /* key binding */
 	KBNODE snode = find_prev_kbnode( root, node, PKT_PUBLIC_SUBKEY );
 
 	if( snode ) {
@@ -511,14 +565,22 @@
 	    hash_public_key( md, pk );
 	    hash_public_key( md, snode->pkt->pkt.public_key );
 	    rc = do_check( pk, sig, md, r_expired );
+            cache_selfsig_result ( sig, rc );
 	    md_close(md);
 	}
 	else {
-	    log_error("no subkey for key signature packet\n");
+	    log_info ("no subkey for key signature packet\n");
 	    rc = G10ERR_SIG_CLASS;
 	}
     }
-    else {
+    else if( sig->sig_class == 0x1f ) { /* direct key signature */
+	md = md_open( algo, 0 );
+	hash_public_key( md, pk );
+	rc = do_check( pk, sig, md, r_expired );
+        cache_selfsig_result ( sig, rc );
+	md_close(md);
+    }
+    else { /* all other classes */
 	KBNODE unode = find_prev_kbnode( root, node, PKT_USER_ID );
 
 	if( unode ) {
@@ -532,6 +594,7 @@
 		if( is_selfsig )
 		    *is_selfsig = 1;
 		rc = do_check( pk, sig, md, r_expired );
+                cache_selfsig_result ( sig, rc );
 	    }
 	    else {
 		rc = do_signature_check( sig, md, r_expiredate, r_expired );
@@ -539,7 +602,8 @@
 	    md_close(md);
 	}
 	else {
-	    log_error("no user ID for key signature packet\n");
+	    log_info ("no user ID for key signature packet of class %02x\n",
+                      sig->sig_class );
 	    rc = G10ERR_SIG_CLASS;
 	}
     }
diff -urN gnupg-1.0.4/g10/sign.c gnupg-1.0.5/g10/sign.c
--- gnupg-1.0.4/g10/sign.c	Fri Sep 29 16:47:19 2000
+++ gnupg-1.0.5/g10/sign.c	Tue Mar 27 16:23:03 2001
@@ -1,5 +1,5 @@
 /* sign.c - sign data
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -132,6 +132,27 @@
 			     digest_algo, mpi_get_nbits(sk->skey[0]), 0 );
     rc = pubkey_sign( sk->pubkey_algo, sig->data, frame, sk->skey );
     mpi_free(frame);
+    if (!rc && !opt.no_sig_create_check) {
+        /* check that the signature verification worked and nothing is
+         * fooling us e.g. by a bug in the signature create
+         * code or by deliberately introduced faults. */
+        PKT_public_key *pk = m_alloc_clear (sizeof *pk);
+
+        if( get_pubkey( pk, sig->keyid ) )
+            rc = G10ERR_NO_PUBKEY;
+        else {
+            frame = encode_md_value (pk->pubkey_algo, md,
+                                     sig->digest_algo,
+                                     mpi_get_nbits(pk->pkey[0]), 0);
+            rc = pubkey_verify (pk->pubkey_algo, frame, sig->data, pk->pkey,
+                                NULL, NULL );
+            mpi_free (frame);
+        }
+        if (rc)
+            log_error (_("checking created signature failed: %s\n"),
+                         g10_errstr (rc));
+        free_public_key (pk);
+    }
     if( rc )
 	log_error(_("signing failed: %s\n"), g10_errstr(rc) );
     else {
@@ -154,10 +175,6 @@
 
     if( !(rc=check_secret_key( sk, 0 )) )
 	rc = do_sign( sk, sig, md, 0 );
-
-    /* fixme: should we check whether the signature is okay?
-     * maybe by using an option */
-
     return rc;
 }
 
@@ -430,7 +447,7 @@
 	    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 */
+             * so we switch to partial length encoding in this case */
             if ( filesize >= IOBUF_FILELENGTH_LIMIT )
                 filesize = 0;
 
@@ -562,8 +579,11 @@
   leave:
     if( rc )
 	iobuf_cancel(out);
-    else
+    else {
 	iobuf_close(out);
+        if (encrypt)
+            write_status( STATUS_END_ENCRYPTION );
+    }
     iobuf_close(inp);
     md_close( mfx.md );
     release_sk_list( sk_list );
@@ -630,7 +650,7 @@
     }
 
     if( old_style && only_md5 )
-	iobuf_writestr(out, "\n" );
+	iobuf_writestr(out, LF );
     else {
 	const char *s;
 	int any = 0;
@@ -654,11 +674,11 @@
 	    }
 	}
 	assert(any);
-	iobuf_writestr(out, "\n" );
+	iobuf_writestr(out, LF );
 	if( opt.not_dash_escaped )
 	    iobuf_writestr( out,
-		"NotDashEscaped: You need GnuPG to verify this message\n" );
-	iobuf_writestr(out, "\n" );
+		"NotDashEscaped: You need GnuPG to verify this message" LF );
+	iobuf_writestr(out, LF );
     }
 
 
diff -urN gnupg-1.0.4/g10/signal.c gnupg-1.0.5/g10/signal.c
--- gnupg-1.0.4/g10/signal.c	Thu Jun  8 22:07:50 2000
+++ gnupg-1.0.5/g10/signal.c	Mon Mar 12 17:01:11 2001
@@ -1,5 +1,5 @@
 /* signal.c - signal handling
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -38,6 +38,36 @@
 static volatile int caught_fatal_sig = 0;
 static volatile int caught_sigusr1 = 0;
 
+static void
+init_one_signal (int sig, RETSIGTYPE (*handler)(int), int check_ign )
+{
+ #ifndef HAVE_DOSISH_SYSTEM
+  #if HAVE_SIGACTION
+    struct sigaction oact, nact;
+
+    if (check_ign) {
+        /* we don't want to change an IGN handler */
+        sigaction (sig, NULL, &oact );
+        if (oact.sa_handler == SIG_IGN )
+            return;
+    }
+
+    nact.sa_handler = handler;
+    sigemptyset (&nact.sa_mask);
+    nact.sa_flags = 0;
+    sigaction ( sig, &nact, NULL);
+  #else 
+    RETSIGTYPE (*ohandler)(int);
+
+    ohandler = signal (sig, handler);
+    if (check_ign && ohandler == SIG_IGN) {
+        /* Change it back if it was already set to IGN */
+        signal (sig, SIG_IGN);
+    }
+  #endif
+ #endif /*!HAVE_DOSISH_SYSTEM*/
+}
+
 static const char *
 get_signal_name( int signum )
 {
@@ -66,15 +96,9 @@
     s = get_signal_name(sig); write(2, s, strlen(s) );
     write(2, " caught ... exiting\n", 21 );
 
-  #ifndef HAVE_DOSISH_SYSTEM
-    {	/* reset action to default action and raise signal again */
-	struct sigaction nact;
-	nact.sa_handler = SIG_DFL;
-	sigemptyset( &nact.sa_mask );
-	nact.sa_flags = 0;
-	sigaction( sig, &nact, NULL);
-    }
-  #endif
+    /* reset action to default action and raise signal again */
+    init_one_signal (sig, SIG_DFL, 0);
+    remove_lockfiles ();
     raise( sig );
 }
 
@@ -85,37 +109,18 @@
     caught_sigusr1 = 1;
 }
 
-#ifndef HAVE_DOSISH_SYSTEM
-static void
-do_sigaction( int sig, struct sigaction *nact )
-{
-    struct sigaction oact;
-
-    sigaction( sig, NULL, &oact );
-    if( oact.sa_handler != SIG_IGN )
-	sigaction( sig, nact, NULL);
-}
-#endif
 
 void
 init_signals()
 {
   #ifndef HAVE_DOSISH_SYSTEM
-    struct sigaction nact;
-
-    nact.sa_handler = got_fatal_signal;
-    sigemptyset( &nact.sa_mask );
-    nact.sa_flags = 0;
-
-    do_sigaction( SIGINT, &nact );
-    do_sigaction( SIGHUP, &nact );
-    do_sigaction( SIGTERM, &nact );
-    do_sigaction( SIGQUIT, &nact );
-    do_sigaction( SIGSEGV, &nact );
-    nact.sa_handler = got_usr_signal;
-    sigaction( SIGUSR1, &nact, NULL );
-    nact.sa_handler = SIG_IGN;
-    sigaction( SIGPIPE, &nact, NULL );
+    init_one_signal (SIGINT, got_fatal_signal, 1 );
+    init_one_signal (SIGHUP, got_fatal_signal, 1 );
+    init_one_signal (SIGTERM, got_fatal_signal, 1 );
+    init_one_signal (SIGQUIT, got_fatal_signal, 1 );
+    init_one_signal (SIGSEGV, got_fatal_signal, 1 );
+    init_one_signal (SIGUSR1, got_usr_signal, 0 );
+    init_one_signal (SIGPIPE, SIG_IGN, 0 );
   #endif
 }
 
@@ -124,6 +129,7 @@
 pause_on_sigusr( int which )
 {
   #ifndef HAVE_DOSISH_SYSTEM
+   #ifdef HAVE_SIGPROCMASK
     sigset_t mask, oldmask;
 
     assert( which == 1 );
@@ -135,6 +141,14 @@
 	sigsuspend( &oldmask );
     caught_sigusr1 = 0;
     sigprocmask( SIG_UNBLOCK, &mask, NULL );
+   #else 
+     assert (which == 1);
+     sighold (SIGUSR1);
+     while (!caught_sigusr1)
+         sigpause(SIGUSR1);
+     caught_sigusr1 = 0;
+     sigrelse(SIGUSR1); ????
+   #endif /*!HAVE_SIGPROCMASK*/
   #endif
 }
 
@@ -142,12 +156,13 @@
 static void
 do_block( int block )
 {
-  #ifndef HAVE_DOSISH_SYSTEM
+ #ifndef HAVE_DOSISH_SYSTEM
     static int is_blocked;
+  #ifdef HAVE_SIGPROCMASK
     static sigset_t oldmask;
 
     if( block ) {
-	sigset_t newmask;
+        sigset_t newmask;
 
 	if( is_blocked )
 	    log_bug("signals are already blocked\n");
@@ -161,7 +176,28 @@
 	sigprocmask( SIG_SETMASK, &oldmask, NULL );
 	is_blocked = 0;
     }
-  #endif /*HAVE_DOSISH_SYSTEM*/
+  #else /*!HAVE_SIGPROCMASK*/
+    static void (*disposition[MAXSIG])();
+    int sig;
+
+    if( block ) {
+	if( is_blocked )
+	    log_bug("signals are already blocked\n");
+        for (sig=1; sig < MAXSIG; sig++) {
+            disposition[sig] = sigset (sig, SIG_HOLD);
+        }
+	is_blocked = 1;
+    }
+    else {
+	if( !is_blocked )
+	    log_bug("signals are not blocked\n");
+        for (sig=1; sig < MAXSIG; sig++) {
+            sigset (sig, disposition[sig]);
+        }
+	is_blocked = 0;
+    }
+  #endif /*!HAVE_SIGPROCMASK*/
+ #endif /*HAVE_DOSISH_SYSTEM*/
 }
 
 
@@ -176,4 +212,3 @@
 {
     do_block(0);
 }
-
diff -urN gnupg-1.0.4/g10/skclist.c gnupg-1.0.5/g10/skclist.c
--- gnupg-1.0.4/g10/skclist.c	Tue May  9 09:01:38 2000
+++ gnupg-1.0.5/g10/skclist.c	Fri Apr 27 14:26:28 2001
@@ -1,5 +1,5 @@
 /* skclist.c
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -60,6 +60,27 @@
 }
 
 
+static int
+key_present_in_sk_list(SK_LIST sk_list, PKT_secret_key *sk)
+{
+    for (; sk_list; sk_list = sk_list->next) {
+	if ( !cmp_secret_keys(sk_list->sk, sk) )
+	    return 0;
+    }
+    return -1;
+}
+
+static int
+is_duplicated_entry (STRLIST list, STRLIST item)
+{
+    for(; list && list != item; list = list->next) {
+        if ( !strcmp (list->d, item->d) )
+            return 1;
+    }
+    return 0;
+}
+
+
 int
 build_sk_list( STRLIST locusr, SK_LIST *ret_sk_list, int unlock,
 							unsigned use )
@@ -71,13 +92,14 @@
 	PKT_secret_key *sk;
 
 	sk = m_alloc_clear( sizeof *sk );
-	sk->pubkey_usage = use;
+	sk->req_usage = use;
 	if( (rc = get_seckey_byname( sk, NULL, unlock )) ) {
 	    free_secret_key( sk ); sk = NULL;
 	    log_error("no default secret key: %s\n", g10_errstr(rc) );
 	}
 	else if( !(rc=check_pubkey_algo2(sk->pubkey_algo, use)) ) {
 	    SK_LIST r;
+
 	    if( sk->version == 4 && (use & PUBKEY_USAGE_SIG)
 		&& sk->pubkey_algo == PUBKEY_ALGO_ELGAMAL_E ) {
 		log_info("this is a PGP generated "
@@ -103,17 +125,36 @@
 	}
     }
     else {
+        STRLIST locusr_orig = locusr;
 	for(; locusr; locusr = locusr->next ) {
 	    PKT_secret_key *sk;
-
+            
+            rc = 0;
+            /* Do an early check agains duplicated entries.  However this
+             * won't catch all duplicates because the user IDs may be
+             * specified in different ways.
+             */
+            if ( is_duplicated_entry ( locusr_orig, locusr ) ) {
+		log_error(_("skipped `%s': duplicated\n"), locusr->d );
+                continue;
+            }
 	    sk = m_alloc_clear( sizeof *sk );
-	    sk->pubkey_usage = use;
-	    if( (rc = get_seckey_byname( sk, locusr->d, unlock )) ) {
+	    sk->req_usage = use;
+	    if( (rc = get_seckey_byname( sk, locusr->d, 0 )) ) {
 		free_secret_key( sk ); sk = NULL;
 		log_error(_("skipped `%s': %s\n"), locusr->d, g10_errstr(rc) );
 	    }
+            else if ( key_present_in_sk_list(sk_list, sk) == 0) {
+                free_secret_key(sk); sk = NULL;
+                log_info(_("skipped: secret key already present\n"));
+            }
+            else if ( unlock && (rc = check_secret_key( sk, 0 )) ) {
+		free_secret_key( sk ); sk = NULL;
+		log_error(_("skipped `%s': %s\n"), locusr->d, g10_errstr(rc) );
+            }
 	    else if( !(rc=check_pubkey_algo2(sk->pubkey_algo, use)) ) {
 		SK_LIST r;
+
 		if( sk->version == 4 && (use & PUBKEY_USAGE_SIG)
 		    && sk->pubkey_algo == PUBKEY_ALGO_ELGAMAL_E ) {
 		    log_info(_("skipped `%s': this is a PGP generated "
diff -urN gnupg-1.0.4/g10/status.c gnupg-1.0.5/g10/status.c
--- gnupg-1.0.4/g10/status.c	Fri Oct 13 12:32:10 2000
+++ gnupg-1.0.5/g10/status.c	Fri Mar 23 16:41:12 2001
@@ -1,5 +1,5 @@
 /* status.c
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -30,6 +30,7 @@
     #include <sys/capability.h>
   #endif
   #ifdef HAVE_SYS_IPC_H
+    #include <sys/types.h>
     #include <sys/ipc.h>
   #endif
   #ifdef HAVE_SYS_SHM_H
@@ -51,7 +52,8 @@
 
 
 
-static int fd = -1;
+static FILE *statusfp;
+
 #ifdef USE_SHM_COPROCESSING
   static int shm_id = -1;
   static volatile char *shm_area;
@@ -72,22 +74,111 @@
     write_status_text ( STATUS_PROGRESS, buf );
 }
 
+static const char *
+get_status_string ( int no ) 
+{
+    const char *s;
+
+    switch( no ) {
+      case STATUS_ENTER  : s = "ENTER"; break;
+      case STATUS_LEAVE  : s = "LEAVE"; break;
+      case STATUS_ABORT  : s = "ABORT"; break;
+      case STATUS_GOODSIG: s = "GOODSIG"; break;
+      case STATUS_SIGEXPIRED: s = "SIGEXPIRED"; break;
+      case STATUS_KEYREVOKED: s = "KEYREVOKED"; break;
+      case STATUS_BADSIG : s = "BADSIG"; break;
+      case STATUS_ERRSIG : s = "ERRSIG"; break;
+      case STATUS_BADARMOR : s = "BADARMOR"; break;
+      case STATUS_RSA_OR_IDEA : s= "RSA_OR_IDEA"; break;
+      case STATUS_TRUST_UNDEFINED: s = "TRUST_UNDEFINED"; break;
+      case STATUS_TRUST_NEVER	 : s = "TRUST_NEVER"; break;
+      case STATUS_TRUST_MARGINAL : s = "TRUST_MARGINAL"; break;
+      case STATUS_TRUST_FULLY	 : s = "TRUST_FULLY"; break;
+      case STATUS_TRUST_ULTIMATE : s = "TRUST_ULTIMATE"; break;
+      case STATUS_GET_BOOL	 : s = "GET_BOOL"; break;
+      case STATUS_GET_LINE	 : s = "GET_LINE"; break;
+      case STATUS_GET_HIDDEN	 : s = "GET_HIDDEN"; break;
+      case STATUS_GOT_IT	 : s = "GOT_IT"; break;
+      case STATUS_SHM_INFO	 : s = "SHM_INFO"; break;
+      case STATUS_SHM_GET	 : s = "SHM_GET"; break;
+      case STATUS_SHM_GET_BOOL	 : s = "SHM_GET_BOOL"; break;
+      case STATUS_SHM_GET_HIDDEN : s = "SHM_GET_HIDDEN"; break;
+      case STATUS_NEED_PASSPHRASE: s = "NEED_PASSPHRASE"; break;
+      case STATUS_VALIDSIG	 : s = "VALIDSIG"; break;
+      case STATUS_SIG_ID	 : s = "SIG_ID"; break;
+      case STATUS_ENC_TO	 : s = "ENC_TO"; break;
+      case STATUS_NODATA	 : s = "NODATA"; break;
+      case STATUS_BAD_PASSPHRASE : s = "BAD_PASSPHRASE"; break;
+      case STATUS_NO_PUBKEY	 : s = "NO_PUBKEY"; break;
+      case STATUS_NO_SECKEY	 : s = "NO_SECKEY"; break;
+      case STATUS_NEED_PASSPHRASE_SYM: s = "NEED_PASSPHRASE_SYM"; break;
+      case STATUS_DECRYPTION_FAILED: s = "DECRYPTION_FAILED"; break;
+      case STATUS_DECRYPTION_OKAY: s = "DECRYPTION_OKAY"; break;
+      case STATUS_MISSING_PASSPHRASE: s = "MISSING_PASSPHRASE"; break;
+      case STATUS_GOOD_PASSPHRASE : s = "GOOD_PASSPHRASE"; break;
+      case STATUS_GOODMDC	 : s = "GOODMDC"; break;
+      case STATUS_BADMDC	 : s = "BADMDC"; break;
+      case STATUS_ERRMDC	 : s = "ERRMDC"; break;
+      case STATUS_IMPORTED	 : s = "IMPORTED"; break;
+      case STATUS_IMPORT_RES	 : s = "IMPORT_RES"; break;
+      case STATUS_FILE_START	 : s = "FILE_START"; break;
+      case STATUS_FILE_DONE	 : s = "FILE_DONE"; break;
+      case STATUS_FILE_ERROR	 : s = "FILE_ERROR"; break;
+      case STATUS_BEGIN_DECRYPTION:s = "BEGIN_DECRYPTION"; break;
+      case STATUS_END_DECRYPTION : s = "END_DECRYPTION"; break;
+      case STATUS_BEGIN_ENCRYPTION:s = "BEGIN_ENCRYPTION"; break;
+      case STATUS_END_ENCRYPTION : s = "END_ENCRYPTION"; break;
+      case STATUS_DELETE_PROBLEM : s = "DELETE_PROBLEM"; break;
+      case STATUS_PROGRESS	 : s = "PROGRESS"; break;
+      case STATUS_SIG_CREATED	 : s = "SIG_CREATED"; break;
+      case STATUS_SESSION_KEY	 : s = "SESSION_KEY"; break;
+      case STATUS_NOTATION_NAME  : s = "NOTATION_NAME" ; break;
+      case STATUS_NOTATION_DATA  : s = "NOTATION_DATA" ; break;
+      case STATUS_POLICY_URL     : s = "POLICY_URL" ; break;
+      case STATUS_BEGIN_STREAM   : s = "BEGIN_STREAM"; break;
+      case STATUS_END_STREAM     : s = "END_STREAM"; break;
+      case STATUS_KEY_CREATED    : s = "KEY_CREATED"; break;
+      case STATUS_USERID_HINT    : s = "USERID_HINT"; break;
+      case STATUS_UNEXPECTED     : s = "UNEXPECTED"; break;
+      default: s = "?"; break;
+    }
+    return s;
+}
 
 void
-set_status_fd ( int newfd )
+set_status_fd ( int fd )
 {
-    fd = newfd;
-    if ( fd != -1 ) {
-	register_primegen_progress ( progress_cb, "primegen" );
-	register_pk_dsa_progress ( progress_cb, "pk_dsa" );
-	register_pk_elg_progress ( progress_cb, "pk_elg" );
+    static int last_fd = -1;
+
+    if ( fd != -1 && last_fd == fd )
+        return;
+
+    if ( statusfp && statusfp != stdout && statusfp != stderr )
+        fclose (statusfp);
+    statusfp = NULL;
+    if ( fd == -1 ) 
+        return;
+
+    if( fd == 1 )
+	statusfp = stdout;
+    else if( fd == 2 )
+	statusfp = stderr;
+    else
+	statusfp = fdopen( fd, "w" );
+    if( !statusfp ) {
+	log_fatal("can't open fd %d for status output: %s\n",
+                  fd, strerror(errno));
     }
+    last_fd = fd;
+    register_primegen_progress ( progress_cb, "primegen" );
+    register_pk_dsa_progress ( progress_cb, "pk_dsa" );
+    register_pk_elg_progress ( progress_cb, "pk_elg" );
 }
 
 int
 is_status_enabled()
 {
-    return fd != -1;
+    return !!statusfp;
 }
 
 void
@@ -99,76 +190,73 @@
 void
 write_status_text ( int no, const char *text)
 {
-    const char *s;
-
-    if( fd == -1 )
+    if( !statusfp )
 	return;  /* not enabled */
 
-    switch( no ) {
-      case STATUS_ENTER  : s = "ENTER\n"; break;
-      case STATUS_LEAVE  : s = "LEAVE\n"; break;
-      case STATUS_ABORT  : s = "ABORT\n"; break;
-      case STATUS_GOODSIG: s = "GOODSIG\n"; break;
-      case STATUS_SIGEXPIRED: s = "SIGEXPIRED\n"; break;
-      case STATUS_KEYREVOKED: s = "KEYREVOKED\n"; break;
-      case STATUS_BADSIG : s = "BADSIG\n"; break;
-      case STATUS_ERRSIG : s = "ERRSIG\n"; break;
-      case STATUS_BADARMOR : s = "BADARMOR\n"; break;
-      case STATUS_RSA_OR_IDEA : s= "RSA_OR_IDEA\n"; break;
-      case STATUS_TRUST_UNDEFINED: s = "TRUST_UNDEFINED\n"; break;
-      case STATUS_TRUST_NEVER	 : s = "TRUST_NEVER\n"; break;
-      case STATUS_TRUST_MARGINAL : s = "TRUST_MARGINAL\n"; break;
-      case STATUS_TRUST_FULLY	 : s = "TRUST_FULLY\n"; break;
-      case STATUS_TRUST_ULTIMATE : s = "TRUST_ULTIMATE\n"; break;
-      case STATUS_GET_BOOL	 : s = "GET_BOOL\n"; break;
-      case STATUS_GET_LINE	 : s = "GET_LINE\n"; break;
-      case STATUS_GET_HIDDEN	 : s = "GET_HIDDEN\n"; break;
-      case STATUS_GOT_IT	 : s = "GOT_IT\n"; break;
-      case STATUS_SHM_INFO	 : s = "SHM_INFO\n"; break;
-      case STATUS_SHM_GET	 : s = "SHM_GET\n"; break;
-      case STATUS_SHM_GET_BOOL	 : s = "SHM_GET_BOOL\n"; break;
-      case STATUS_SHM_GET_HIDDEN : s = "SHM_GET_HIDDEN\n"; break;
-      case STATUS_NEED_PASSPHRASE: s = "NEED_PASSPHRASE\n"; break;
-      case STATUS_VALIDSIG	 : s = "VALIDSIG\n"; break;
-      case STATUS_SIG_ID	 : s = "SIG_ID\n"; break;
-      case STATUS_ENC_TO	 : s = "ENC_TO\n"; break;
-      case STATUS_NODATA	 : s = "NODATA\n"; break;
-      case STATUS_BAD_PASSPHRASE : s = "BAD_PASSPHRASE\n"; break;
-      case STATUS_NO_PUBKEY	 : s = "NO_PUBKEY\n"; break;
-      case STATUS_NO_SECKEY	 : s = "NO_SECKEY\n"; break;
-      case STATUS_NEED_PASSPHRASE_SYM: s = "NEED_PASSPHRASE_SYM\n"; break;
-      case STATUS_DECRYPTION_FAILED: s = "DECRYPTION_FAILED\n"; break;
-      case STATUS_DECRYPTION_OKAY: s = "DECRYPTION_OKAY\n"; break;
-      case STATUS_MISSING_PASSPHRASE: s = "MISSING_PASSPHRASE\n"; break;
-      case STATUS_GOOD_PASSPHRASE : s = "GOOD_PASSPHRASE\n"; break;
-      case STATUS_GOODMDC	 : s = "GOODMDC\n"; break;
-      case STATUS_BADMDC	 : s = "BADMDC\n"; break;
-      case STATUS_ERRMDC	 : s = "ERRMDC\n"; break;
-      case STATUS_IMPORTED	 : s = "IMPORTED\n"; break;
-      case STATUS_IMPORT_RES	 : s = "IMPORT_RES\n"; break;
-      case STATUS_FILE_START	 : s = "FILE_START\n"; break;
-      case STATUS_FILE_DONE	 : s = "FILE_DONE\n"; break;
-      case STATUS_FILE_ERROR	 : s = "FILE_ERROR\n"; break;
-      case STATUS_BEGIN_DECRYPTION:s = "BEGIN_DECRYPTION\n"; break;
-      case STATUS_END_DECRYPTION : s = "END_DECRYPTION\n"; break;
-      case STATUS_BEGIN_ENCRYPTION:s = "BEGIN_ENCRYPTION\n"; break;
-      case STATUS_END_ENCRYPTION : s = "END_ENCRYPTION\n"; break;
-      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;
-    }
-
-    write( fd, "[GNUPG:] ", 9 );
+    fputs ( "[GNUPG:] ", statusfp );
+    fputs ( get_status_string (no), statusfp );
     if( text ) {
-	write( fd, s, strlen(s)-1 );
-	write( fd, " ", 1 );
-	write( fd, text, strlen(text) );
-	write( fd, "\n", 1 );
+        putc ( ' ', statusfp );
+        for (; *text; text++) {
+            if (*text == '\n')
+                fputs ( "\\n", statusfp );
+            else if (*text == '\r')
+                fputs ( "\\r", statusfp );
+            else 
+                putc ( *(const byte *)text,  statusfp );
+        }
     }
-    else
-	write( fd, s, strlen(s) );
+    putc ('\n',statusfp);
+    fflush (statusfp);
+}
+
+
+/*
+ * Write a status line with a buffer using %XX escapes.  
+ * If WRAP is > 0 wrap the line after this length. 
+ */
+void
+write_status_buffer ( int no, const char *buffer, size_t len, int wrap )
+{
+    const char *s, *text;
+    int esc;
+    size_t n, count, dowrap;
+
+    if( !statusfp )
+	return;  /* not enabled */
+
+    text = get_status_string (no);
+    count = dowrap = 1;
+    do {
+        if (dowrap) {
+            fprintf (statusfp, "[GNUPG:] %s ", text );
+            count = dowrap = 0;
+        }
+        for (esc=0, s=buffer, n=len; n && !esc; s++, n-- ) {
+            if ( *s == '%' || *(const byte*)s <= ' ' ) 
+                esc = 1;
+            if ( wrap && ++count > wrap ) {
+                dowrap=1;
+                break;
+            }
+        }
+        if (esc) {
+            s--; n++;
+        }
+        if (s != buffer) 
+            fwrite (buffer, s-buffer, 1, statusfp );
+        if ( esc ) {
+            fprintf (statusfp, "%%%02X", *(const byte*)s );
+            s++; n--;
+        }
+        buffer = s;
+        len = n;
+        if ( dowrap && len )
+            putc ( '\n', statusfp );
+    } while ( len );
+
+    putc ('\n',statusfp);
+    fflush (statusfp);
 }
 
 
@@ -360,7 +448,11 @@
             eof_emmited++;
         }
         else { /* Ctrl-D not caught - do something reasonable */
+          #ifdef HAVE_DOSISH_SYSTEM
+            raise (SIGINT);  /* nothing to hangup under DOS */
+          #else
             raise (SIGHUP); /* no more input data */
+          #endif
         }
     }    
     return rc;
@@ -426,6 +518,23 @@
 }
 
 char *
+cpr_get_no_help( const char *keyword, const char *prompt )
+{
+    char *p;
+
+    if( opt.command_fd != -1 )
+	return do_get_from_fd ( keyword, 0, 0 );
+  #ifdef USE_SHM_COPROCESSING
+    if( opt.shm_coprocess )
+	return do_shm_get( keyword, 0, 0 );
+  #endif
+    for(;;) {
+	p = tty_get( prompt );
+        return p;
+    }
+}
+
+char *
 cpr_get( const char *keyword, const char *prompt )
 {
     char *p;
@@ -446,6 +555,7 @@
 	    return p;
     }
 }
+
 
 char *
 cpr_get_utf8( const char *keyword, const char *prompt )
diff -urN gnupg-1.0.4/g10/status.h gnupg-1.0.5/g10/status.h
--- gnupg-1.0.4/g10/status.h	Thu Jul 27 11:07:08 2000
+++ gnupg-1.0.5/g10/status.h	Fri Mar 23 16:41:44 2001
@@ -1,5 +1,5 @@
 /* status.h
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -82,13 +82,22 @@
 #define STATUS_PROGRESS 	50
 #define STATUS_SIG_CREATED	51
 #define STATUS_SESSION_KEY	52
-
+#define STATUS_NOTATION_NAME    53
+#define STATUS_NOTATION_DATA    54
+#define STATUS_POLICY_URL       55
+#define STATUS_BEGIN_STREAM     56
+#define STATUS_END_STREAM       57
+#define STATUS_KEY_CREATED      58
+#define STATUS_USERID_HINT      59
+#define STATUS_UNEXPECTED       60
 
 /*-- status.c --*/
 void set_status_fd ( int fd );
 int  is_status_enabled ( void );
 void write_status ( int no );
 void write_status_text ( int no, const char *text );
+void write_status_buffer ( int no,
+                           const char *buffer, size_t len, int wrap );
 
 #ifdef USE_SHM_COPROCESSING
   void init_shm_coprocessing ( ulong requested_shm_size, int lock_mem );
@@ -96,6 +105,7 @@
 
 int cpr_enabled(void);
 char *cpr_get( const char *keyword, const char *prompt );
+char *cpr_get_no_help( const char *keyword, const char *prompt );
 char *cpr_get_utf8( const char *keyword, const char *prompt );
 char *cpr_get_hidden( const char *keyword, const char *prompt );
 void cpr_kill_prompt(void);
diff -urN gnupg-1.0.4/g10/tdbdump.c gnupg-1.0.5/g10/tdbdump.c
--- gnupg-1.0.4/g10/tdbdump.c	Tue May  9 09:01:21 2000
+++ gnupg-1.0.5/g10/tdbdump.c	Thu Mar  8 15:10:48 2001
@@ -1,5 +1,5 @@
 /* tdbdump.c
- *	Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/g10/tdbio.c gnupg-1.0.5/g10/tdbio.c
--- gnupg-1.0.4/g10/tdbio.c	Tue May  9 09:01:15 2000
+++ gnupg-1.0.5/g10/tdbio.c	Thu Mar  8 15:10:59 2001
@@ -1,5 +1,5 @@
 /* tdbio.c
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/g10/tdbio.h gnupg-1.0.5/g10/tdbio.h
--- gnupg-1.0.4/g10/tdbio.h	Tue May  9 09:05:12 2000
+++ gnupg-1.0.5/g10/tdbio.h	Thu Mar  8 15:11:08 2001
@@ -1,5 +1,5 @@
 /* tdbio.h - Trust database I/O functions
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/g10/textfilter.c gnupg-1.0.5/g10/textfilter.c
--- gnupg-1.0.4/g10/textfilter.c	Tue May  9 09:01:07 2000
+++ gnupg-1.0.5/g10/textfilter.c	Thu Mar  8 15:11:15 2001
@@ -1,5 +1,5 @@
 /* textfilter.c
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/g10/trustdb.c gnupg-1.0.5/g10/trustdb.c
--- gnupg-1.0.4/g10/trustdb.c	Wed Sep  6 14:00:41 2000
+++ gnupg-1.0.5/g10/trustdb.c	Thu Mar  8 15:11:23 2001
@@ -1,5 +1,5 @@
 /* trustdb.c
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/g10/trustdb.h gnupg-1.0.5/g10/trustdb.h
--- gnupg-1.0.4/g10/trustdb.h	Tue May  9 09:05:19 2000
+++ gnupg-1.0.5/g10/trustdb.h	Thu Mar  8 15:11:35 2001
@@ -1,5 +1,5 @@
 /* trustdb.h - Trust database
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/g10/verify.c gnupg-1.0.5/g10/verify.c
--- gnupg-1.0.4/g10/verify.c	Tue May  9 09:00:55 2000
+++ gnupg-1.0.5/g10/verify.c	Thu Mar  8 14:58:40 2001
@@ -1,5 +1,5 @@
 /* verify.c - verify signed data
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
+#include <unistd.h> /* for isatty() */
 
 #include "options.h"
 #include "packet.h"
@@ -60,6 +61,31 @@
     STRLIST sl;
 
     memset( &afx, 0, sizeof afx);
+    /* decide whether we should handle a detached or a normal signature,
+     * which is needed so that the code later can hash the correct data and
+     * not have a normal signature act as detached signature and ignoring the
+     * indended signed material from the 2nd file or stdin.
+     * 1. gpg <file        - normal
+     * 2. gpg file         - normal (or detached)
+     * 3. gpg file <file2  - detached
+     * 4. gpg file file2   - detached
+     * The question is how decide between case 2 and 3?  The only way
+     * we can do it is by reading one byte from stdin and the unget
+     * it; the problem here is that we may be reading from the
+     * terminal (which could be detected using isatty() but won't work
+     * when under contol of a pty using program (e.g. expect)) and
+     * might get us in trouble when stdin is used for another purpose
+     * (--passphrase-fd 0).  So we have to break with the behaviour
+     * prior to gpg 1.0.4 by assuming that case 3 is a normal
+     * signature (where file2 is ignored and require for a detached
+     * signature to indicate signed material comes from stdin by using
+     * case 4 with a file2 of "-".
+     *
+     * Actually we don't have to change anything here but can handle
+     * that all quite easily in mainproc.c 
+     */
+     
+
     sigfile = nfiles? *files : NULL;
 
     /* open the signature file */
@@ -161,4 +187,3 @@
     }
     return 0;
 }
-
diff -urN gnupg-1.0.4/include/ChangeLog gnupg-1.0.5/include/ChangeLog
--- gnupg-1.0.4/include/ChangeLog	Thu Oct 12 11:42:17 2000
+++ gnupg-1.0.5/include/ChangeLog	Mon Apr 23 13:25:49 2001
@@ -1,3 +1,25 @@
+2001-04-23  Werner Koch  <wk@gnupg.org>
+
+	* http.h: New flag HTTP_FLAG_NO_SHUTDOWN.
+
+2001-04-13  Werner Koch  <wk@gnupg.org>
+
+	* iobuf.h: Removed iobuf_fopen.
+
+2001-03-01  Werner Koch  <wk@gnupg.org>
+
+	* errors.h (G10ERR_UNU_SECKEY,G10ERR_UNU_PUBKEY): New
+
+2000-11-30  Werner Koch  <wk@gnupg.org>
+
+	* iobuf.h (iobuf_translate_file_handle): Add prototype.
+
+2000-11-11  Paul Eggert  <eggert@twinsun.com>
+
+        * iobuf.h (iobuf_get_filelength): Now returns off_t, not u32.
+        (struct iobuf_struct, iobuf_set_limit,
+        iobuf_tell, iobuf_seek): Use off_t, not ulong, for file offsets.
+
 2000-10-12  Werner Koch  <wk@gnupg.org>
 
 	* mpi.h: Changed the way mpi_limb_t is defined.
@@ -130,4 +152,16 @@
 
 	* cipher.h (random.h): Add new header and move all relevalt
 	functions to this header.
+
+
+ Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
 
diff -urN gnupg-1.0.4/include/cipher.h gnupg-1.0.5/include/cipher.h
--- gnupg-1.0.4/include/cipher.h	Thu Oct 12 12:23:02 2000
+++ gnupg-1.0.5/include/cipher.h	Sat Apr 28 19:50:00 2001
@@ -1,5 +1,5 @@
 /* cipher.h
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG.
  *
diff -urN gnupg-1.0.4/include/errors.h gnupg-1.0.5/include/errors.h
--- gnupg-1.0.4/include/errors.h	Mon Oct  4 21:26:59 1999
+++ gnupg-1.0.5/include/errors.h	Sat Apr 28 19:50:14 2001
@@ -1,5 +1,5 @@
 /* errors.h - erro code
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG.
  *
@@ -72,6 +72,9 @@
 #define G10ERR_SELFTEST_FAILED 50
 #define G10ERR_NOT_ENCRYPTED  51
 #define G10ERR_NOT_PROCESSED  52
+#define G10ERR_UNU_PUBKEY     53
+#define G10ERR_UNU_SECKEY     54
+
 
 #ifndef HAVE_STRERROR
 char *strerror( int n );
diff -urN gnupg-1.0.4/include/host2net.h gnupg-1.0.5/include/host2net.h
--- gnupg-1.0.4/include/host2net.h	Wed Oct 21 19:34:33 1998
+++ gnupg-1.0.5/include/host2net.h	Sat Apr 28 19:50:26 2001
@@ -1,5 +1,5 @@
 /* host2net.h - Some macros
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG.
  *
diff -urN gnupg-1.0.4/include/http.h gnupg-1.0.5/include/http.h
--- gnupg-1.0.4/include/http.h	Wed May 17 13:01:28 2000
+++ gnupg-1.0.5/include/http.h	Sat Apr 28 19:50:35 2001
@@ -1,5 +1,5 @@
 /* http.h  -  HTTP protocol handler
- *	Copyright (C) 1999 Free Software Foundation, Inc.
+ *	Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -50,7 +50,8 @@
 } HTTP_REQ_TYPE;
 
 enum {	/* put flag values into an enum, so that gdb can display them */
-    HTTP_FLAG_TRY_PROXY = 1
+    HTTP_FLAG_TRY_PROXY = 1,
+    HTTP_FLAG_NO_SHUTDOWN = 2,
 };
 
 struct http_context {
diff -urN gnupg-1.0.4/include/i18n.h gnupg-1.0.5/include/i18n.h
--- gnupg-1.0.4/include/i18n.h	Wed Sep 15 16:26:24 1999
+++ gnupg-1.0.5/include/i18n.h	Sat Apr 28 19:50:45 2001
@@ -1,5 +1,5 @@
 /* i18n.h
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG.
  *
diff -urN gnupg-1.0.4/include/iobuf.h gnupg-1.0.5/include/iobuf.h
--- gnupg-1.0.4/include/iobuf.h	Wed Sep  6 17:15:25 2000
+++ gnupg-1.0.5/include/iobuf.h	Sat Apr 28 19:50:55 2001
@@ -1,5 +1,5 @@
 /* iobuf.h - I/O buffer
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG.
  *
@@ -40,9 +40,9 @@
 /* fixme: we should hide most of this stuff */
 struct iobuf_struct {
     int use;	       /* 1 input , 2 output, 3 temp */
-    unsigned long nlimit;
-    unsigned long nbytes; /* used together with nlimit */
-    unsigned long ntotal; /* total bytes read (position of stream) */
+    off_t nlimit;
+    off_t nbytes;      /* used together with nlimit */
+    off_t ntotal;      /* total bytes read (position of stream) */
     int nofast; 	/* used by the iobuf_get() */
     void *directfp;
     struct {
@@ -73,15 +73,17 @@
 
 int iobuf_debug_mode;
 
+void  iobuf_enable_special_filenames ( int yes );
 IOBUF iobuf_alloc(int use, size_t bufsize);
 IOBUF iobuf_temp(void);
 IOBUF iobuf_temp_with_content( const char *buffer, size_t length );
 IOBUF iobuf_open( const char *fname );
 IOBUF iobuf_fdopen( int fd, const char *mode );
-IOBUF iobuf_fopen( const char *fname, const char *mode );
+IOBUF iobuf_sockopen( int fd, const char *mode );
 IOBUF iobuf_create( const char *fname );
 IOBUF iobuf_append( const char *fname );
 IOBUF iobuf_openrw( const char *fname );
+int   iobuf_ioctl ( IOBUF a, int cmd, int intval, void *ptrval );
 int   iobuf_close( IOBUF iobuf );
 int   iobuf_cancel( IOBUF iobuf );
 
@@ -96,10 +98,10 @@
 #define iobuf_set_error(a)    do { (a)->error = 1; } while(0)
 #define iobuf_error(a)	      ((a)->error)
 
-void iobuf_set_limit( IOBUF a, unsigned long nlimit );
+void iobuf_set_limit( IOBUF a, off_t nlimit );
 
-ulong iobuf_tell( IOBUF a );
-int   iobuf_seek( IOBUF a, ulong newpos );
+off_t iobuf_tell( IOBUF a );
+int   iobuf_seek( IOBUF a, off_t newpos );
 
 int  iobuf_readbyte(IOBUF a);
 int  iobuf_read(IOBUF a, byte *buf, unsigned buflen );
@@ -115,7 +117,7 @@
 size_t iobuf_temp_to_buffer( IOBUF a, byte *buffer, size_t buflen );
 void iobuf_unget_and_close_temp( IOBUF a, IOBUF temp );
 
-u32 iobuf_get_filelength( IOBUF a );
+off_t 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 );
@@ -123,6 +125,9 @@
 void iobuf_set_block_mode( IOBUF a, size_t n );
 void iobuf_set_partial_block_mode( IOBUF a, size_t len );
 int  iobuf_in_block_mode( IOBUF a );
+
+int iobuf_translate_file_handle ( int fd, int for_write );
+
 
 /* get a byte form the iobuf; must check for eof prior to this function
  * this function returns values in the range 0 .. 255 or -1 to indicate EOF
diff -urN gnupg-1.0.4/include/memory.h gnupg-1.0.5/include/memory.h
--- gnupg-1.0.4/include/memory.h	Mon Oct 12 22:16:33 1998
+++ gnupg-1.0.5/include/memory.h	Sat Apr 28 19:51:06 2001
@@ -1,5 +1,5 @@
 /* memory.h - memory allocation
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG.
  *
diff -urN gnupg-1.0.4/include/mpi.h gnupg-1.0.5/include/mpi.h
--- gnupg-1.0.4/include/mpi.h	Fri Oct 13 17:56:17 2000
+++ gnupg-1.0.5/include/mpi.h	Sat Apr 28 19:51:22 2001
@@ -1,5 +1,6 @@
 /* mpi.h  -  Multi Precision Integers
- *	Copyright (C) 1994, 1996, 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1994, 1996, 1998, 1999,
+ *                    2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG.
  *
diff -urN gnupg-1.0.4/include/ttyio.h gnupg-1.0.5/include/ttyio.h
--- gnupg-1.0.4/include/ttyio.h	Thu Mar  2 15:45:07 2000
+++ gnupg-1.0.5/include/ttyio.h	Sat Apr 28 19:51:35 2001
@@ -1,5 +1,5 @@
 /* ttyio.h
- *	Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG.
  *
diff -urN gnupg-1.0.4/include/types.h gnupg-1.0.5/include/types.h
--- gnupg-1.0.4/include/types.h	Tue Mar 14 14:03:06 2000
+++ gnupg-1.0.5/include/types.h	Sat Apr 28 19:51:46 2001
@@ -1,5 +1,5 @@
 /* types.h - some common typedefs
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG.
  *
diff -urN gnupg-1.0.4/include/util.h gnupg-1.0.5/include/util.h
--- gnupg-1.0.4/include/util.h	Thu Apr 13 08:38:49 2000
+++ gnupg-1.0.5/include/util.h	Sat Apr 28 19:51:57 2001
@@ -1,5 +1,5 @@
 /* util.h
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG.
  *
@@ -136,7 +136,7 @@
 DOTLOCK create_dotlock( const char *file_to_lock );
 int make_dotlock( DOTLOCK h, long timeout );
 int release_dotlock( DOTLOCK h );
-
+void remove_lockfiles (void);
 
 /*-- fileutil.c --*/
 char * make_basename(const char *filepath);
@@ -172,8 +172,12 @@
 const char *memistr( const char *buf, size_t buflen, const char *sub );
 char *mem2str( char *, const void *, size_t);
 char *trim_spaces( char *string );
-unsigned trim_trailing_chars( byte *line, unsigned len, const char *trimchars);
-unsigned trim_trailing_ws( byte *line, unsigned len );
+unsigned int trim_trailing_chars( byte *line, unsigned int len,
+                                  const char *trimchars);
+unsigned int trim_trailing_ws( byte *line, unsigned len );
+unsigned int check_trailing_chars( const byte *line, unsigned int len,
+                                   const char *trimchars );
+unsigned int check_trailing_ws( const byte *line, unsigned int len );
 int string_count_chr( const char *string, int c );
 int set_native_charset( const char *newset );
 const char* get_native_charset(void);
diff -urN gnupg-1.0.4/mpi/ChangeLog gnupg-1.0.5/mpi/ChangeLog
--- gnupg-1.0.4/mpi/ChangeLog	Fri Oct 13 18:04:13 2000
+++ gnupg-1.0.5/mpi/ChangeLog	Tue Apr 17 18:21:40 2001
@@ -1,3 +1,21 @@
+2001-04-17  Werner Koch  <wk@gnupg.org>
+
+	Updated copyright notices.
+
+2001-03-24  Werner Koch  <wk@gnupg.org>
+
+	* mpi-mul.c (mpi_mul): Make sure that secret temporary results are
+	not stored in w.  Suggested by Florian Weimer.
+
+2001-03-18  Werner Koch  <wk@gnupg.org>
+
+	* config.links: Use i386 code for i386.  According to tests by
+	Kevin Ryde the i586 code runs slow on i386 CPUs.  Ditto for i786.
+
+2000-10-24  Werner Koch  <wk@gnupg.org>
+
+	* mips3/: Changed a few comments to C-style. By Jeff Long.
+
 2000-10-13  Werner Koch  <wk@gnupg.org>
 
 	* mpi.h: Removed the inclusion of mpi-asm-defs.h because this
@@ -12,7 +30,7 @@
 
 Wed Jul 19 11:26:43 CEST 2000  Werner Koch  <wk@>
 
-  * config.links: Support for powerpc--netbsd by Gabriel Rosenkoetter.
+        * config.links: Support for powerpc--netbsd by Gabriel Rosenkoetter.
 
 Wed Mar 22 13:50:24 CET 2000  Werner Koch  <wk@openit.de>
 
@@ -252,5 +270,17 @@
 Mon Feb 16 13:00:27 1998  Werner Koch  (wk@isil.d.shuttle.de)
 
 	* config.links : Add detection of m68k cpus
+
+
+
+ Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 
diff -urN gnupg-1.0.4/mpi/Makefile.am gnupg-1.0.5/mpi/Makefile.am
--- gnupg-1.0.4/mpi/Makefile.am	Fri Oct 13 17:46:59 2000
+++ gnupg-1.0.5/mpi/Makefile.am	Thu Mar  8 14:47:36 2001
@@ -1,3 +1,21 @@
+# Copyright (C) 1998, 1999, 2000, 2001 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
+
 ## Process this file with automake to produce Makefile.in
 
 
diff -urN gnupg-1.0.4/mpi/Makefile.in gnupg-1.0.5/mpi/Makefile.in
--- gnupg-1.0.4/mpi/Makefile.in	Tue Oct 17 15:40:15 2000
+++ gnupg-1.0.5/mpi/Makefile.in	Sun Apr 29 16:39:03 2001
@@ -10,6 +10,24 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+# Copyright (C) 1998, 1999, 2000, 2001 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
+
 
 SHELL = @SHELL@
 
@@ -72,6 +90,7 @@
 DATADIRNAME = @DATADIRNAME@
 DLLTOOL = @DLLTOOL@
 DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
+DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@
 DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@
 DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@
 DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@
diff -urN gnupg-1.0.4/mpi/alpha/mpih-add1.S gnupg-1.0.5/mpi/alpha/mpih-add1.S
--- gnupg-1.0.4/mpi/alpha/mpih-add1.S	Tue May 26 15:37:52 1998
+++ gnupg-1.0.5/mpi/alpha/mpih-add1.S	Sun Apr 29 14:30:06 2001
@@ -1,17 +1,15 @@
 /* alpha  add_n -- Add two limb vectors of the same length > 0 and store
  *		   sum in a third limb vector.
+ * Copyright (C) 1995, 1998, 2001 Free Software Foundation, Inc.
  *
- *	Copyright (C) 1995 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ * This file is part of GnuPG.
  *
- * This file is part of GNUPG.
- *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/alpha/mpih-lshift.S gnupg-1.0.5/mpi/alpha/mpih-lshift.S
--- gnupg-1.0.4/mpi/alpha/mpih-lshift.S	Tue May 26 15:37:52 1998
+++ gnupg-1.0.5/mpi/alpha/mpih-lshift.S	Sun Apr 29 14:30:58 2001
@@ -1,15 +1,16 @@
-/* alpha    lshift
- *	Copyright (C) 1994, 1995 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+/* alpha - left shift
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1994, 1995, 1998, 2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ *
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/alpha/mpih-mul1.S gnupg-1.0.5/mpi/alpha/mpih-mul1.S
--- gnupg-1.0.4/mpi/alpha/mpih-mul1.S	Tue May 26 15:37:52 1998
+++ gnupg-1.0.5/mpi/alpha/mpih-mul1.S	Sun Apr 29 14:31:42 2001
@@ -1,16 +1,17 @@
 /* Alpha 21064 mpih-mul1.S -- Multiply a limb vector with a limb and store
  *			      the result in a second limb vector.
  *
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1995, 1998, 
+                      2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/alpha/mpih-mul2.S gnupg-1.0.5/mpi/alpha/mpih-mul2.S
--- gnupg-1.0.4/mpi/alpha/mpih-mul2.S	Tue May 26 15:37:52 1998
+++ gnupg-1.0.5/mpi/alpha/mpih-mul2.S	Sun Apr 29 14:59:28 2001
@@ -1,16 +1,17 @@
 /* Alpha 21064 addmul_1 -- Multiply a limb vector with a limb and add
  *			   the result to a second limb vector.
  *
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1995, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/alpha/mpih-mul3.S gnupg-1.0.5/mpi/alpha/mpih-mul3.S
--- gnupg-1.0.4/mpi/alpha/mpih-mul3.S	Tue May 26 15:37:52 1998
+++ gnupg-1.0.5/mpi/alpha/mpih-mul3.S	Sun Apr 29 14:59:50 2001
@@ -1,15 +1,16 @@
 /* Alpha 21064	submul_1 -- Multiply a limb vector with a limb and
  *			    subtract the result from a second limb vector.
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1995, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/alpha/mpih-rshift.S gnupg-1.0.5/mpi/alpha/mpih-rshift.S
--- gnupg-1.0.4/mpi/alpha/mpih-rshift.S	Tue May 26 15:37:53 1998
+++ gnupg-1.0.5/mpi/alpha/mpih-rshift.S	Sat Apr 28 19:03:03 2001
@@ -1,6 +1,6 @@
 /* alpha    rshift
- *	Copyright (C) 1994, 1995 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1994, 1995, 1998, 1999,
+ *                    2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG.
  *
diff -urN gnupg-1.0.4/mpi/alpha/mpih-sub1.S gnupg-1.0.5/mpi/alpha/mpih-sub1.S
--- gnupg-1.0.4/mpi/alpha/mpih-sub1.S	Tue May 26 15:37:53 1998
+++ gnupg-1.0.5/mpi/alpha/mpih-sub1.S	Sun Apr 29 15:00:38 2001
@@ -1,15 +1,16 @@
 /* Alpha  sub_n -- Subtract two limb vectors of the same length > 0 and
  *		  store difference in a third limb vector.
- * Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1995, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/alpha/udiv-qrnnd.S gnupg-1.0.5/mpi/alpha/udiv-qrnnd.S
--- gnupg-1.0.4/mpi/alpha/udiv-qrnnd.S	Tue Dec 23 18:30:14 1997
+++ gnupg-1.0.5/mpi/alpha/udiv-qrnnd.S	Sun Apr 29 14:32:33 2001
@@ -1,16 +1,16 @@
 /* Alpha 21064 __udiv_qrnnd
  *
- * Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc.
- * Copyright (c) 1997 by Werner Koch (dd9jn)
+ *      Copyright (C) 1992, 1994, 1995, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of G10.
+ * This file is part of GnuPG.
  *
- * G10 is free software; you can redistribute it and/or modify
+ * 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.
  *
- * G10 is distributed in the hope that it will be useful,
+ * 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.
diff -urN gnupg-1.0.4/mpi/config.links gnupg-1.0.5/mpi/config.links
--- gnupg-1.0.4/mpi/config.links	Thu Oct 12 11:43:12 2000
+++ gnupg-1.0.5/mpi/config.links	Sun Apr 29 13:36:18 2001
@@ -1,3 +1,22 @@
+# config.links - helper for ../configure
+# Copyright (C) 1998, 1999, 2000, 2001 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
+
 # sourced by ../configure to get the list of files to link
 # this should set $mpi_ln_src and mpi_ln_dst.
 # Note: this is called from the above directory.
@@ -12,18 +31,18 @@
 
 if test "$try_asm_modules" = "yes" ; then
 case "${target}" in
-    i[34]86*-*-freebsd*-elf  | \
-    i[34]86*-*-freebsd[3-9]* | \
-    i[34]86*-*-freebsdelf*   | \
-    i[34]86*-*-netbsd* )
+    i[3467]86*-*-freebsd*-elf  | \
+    i[3467]86*-*-freebsd[3-9]* | \
+    i[3467]86*-*-freebsdelf*   | \
+    i[3467]86*-*-netbsd* )
        echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
        cat  $srcdir/mpi/i386/syntax.h	   >>./mpi/asm-syntax.h
        path="i386"
        ;;
-    i[56]86*-*-freebsd*-elf  | \
-    i[56]86*-*-freebsd[3-9]* | \
-    i[56]86*-*-freebsdelf*   | \
-    i[56]86*-*-netbsd*	     | \
+    i586*-*-freebsd*-elf  | \
+    i586*-*-freebsd[3-9]* | \
+    i586*-*-freebsdelf*   | \
+    i586*-*-netbsd*	     | \
     pentium-*-netbsd*	     | \
     pentiumpro-*-netbsd*)
        echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
@@ -35,38 +54,38 @@
        cat  $srcdir/mpi/i386/syntax.h	 >>./mpi/asm-syntax.h
        path="i386"
        ;;
-    i[34]86*-*-linuxaout*  | \
-    i[34]86*-*-linuxoldld* | \
-    i[34]86*-*-*bsd*)
+    i[3467]86*-*-linuxaout*  | \
+    i[3467]86*-*-linuxoldld* | \
+    i[3467]86*-*-*bsd*)
 	echo '#define BSD_SYNTAX' >>./mpi/asm-syntax.h
 	echo '#define X86_BROKEN_ALIGN' >>./mpi/asm-syntax.h
 	cat  $srcdir/mpi/i386/syntax.h	    >>./mpi/asm-syntax.h
 	path="i386"
 	;;
-    i[56]86*-*-linuxaout*  | \
-    i[56]86*-*-linuxoldld* | \
-    i[56]86*-*-*bsd*)
+    i586*-*-linuxaout*  | \
+    i586*-*-linuxoldld* | \
+    i586*-*-*bsd*)
 	echo '#define BSD_SYNTAX' >>./mpi/asm-syntax.h
 	echo '#define X86_BROKEN_ALIGN' >>./mpi/asm-syntax.h
 	cat  $srcdir/mpi/i386/syntax.h	    >>./mpi/asm-syntax.h
 	path="i586 i386"
 	;;
-    i[34]86*-msdosdjgpp*)
+    i[3467]86*-msdosdjgpp*)
 	echo '#define BSD_SYNTAX'        >>./mpi/asm-syntax.h
 	cat  $srcdir/mpi/i386/syntax.h	 >>./mpi/asm-syntax.h
 	path="i386"
 	;;
-    i[56]86*-msdosdjgpp*)
+    i586*-msdosdjgpp*)
 	echo '#define BSD_SYNTAX'        >>./mpi/asm-syntax.h
 	cat  $srcdir/mpi/i386/syntax.h	 >>./mpi/asm-syntax.h
 	path="i586 i386"
 	;;
-    i[34]86*-*-*)
+    i[3467]86*-*-*)
 	echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
 	cat  $srcdir/mpi/i386/syntax.h	    >>./mpi/asm-syntax.h
 	path="i386"
 	;;
-    i[56]86*-*-*  | \
+    i586*-*-*  | \
     pentium-*-*   | \
     pentiumpro-*-*)
 	echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
diff -urN gnupg-1.0.4/mpi/g10m.c gnupg-1.0.5/mpi/g10m.c
--- gnupg-1.0.4/mpi/g10m.c	Sat Feb 20 21:45:40 1999
+++ gnupg-1.0.5/mpi/g10m.c	Sun Apr 29 16:07:57 2001
@@ -1,5 +1,5 @@
 /* g10m.c  -  Wrapper for MPI
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -26,7 +26,7 @@
 
 /* FIXME: The modules should use functions from libgcrypt */
 
-const char *g10m_revision_string(int dummy) { return "$Revision: 1.7 $"; }
+const char *g10m_revision_string(int dummy) { return "$Revision: 1.7.2.2 $"; }
 
 MPI
 g10m_new( unsigned nbits )
diff -urN gnupg-1.0.4/mpi/generic/mpih-add1.c gnupg-1.0.5/mpi/generic/mpih-add1.c
--- gnupg-1.0.4/mpi/generic/mpih-add1.c	Wed Nov 26 22:06:59 1997
+++ gnupg-1.0.5/mpi/generic/mpih-add1.c	Sun Apr 29 14:33:18 2001
@@ -1,15 +1,15 @@
 /* mpihelp-add_1.c  -  MPI helper functions
- *	Copyright (c) 1997 by Werner Koch (dd9jn)
- *	Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ * Copyright (C) 1994, 1996, 1997, 1998, 
+ *               2000 Free Software Foundation, Inc.
  *
- * This file is part of G10.
+ * This file is part of GnuPG.
  *
- * G10 is free software; you can redistribute it and/or modify
+ * 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.
  *
- * G10 is distributed in the hope that it will be useful,
+ * 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.
diff -urN gnupg-1.0.4/mpi/generic/mpih-lshift.c gnupg-1.0.5/mpi/generic/mpih-lshift.c
--- gnupg-1.0.4/mpi/generic/mpih-lshift.c	Tue Nov 10 19:35:07 1998
+++ gnupg-1.0.5/mpi/generic/mpih-lshift.c	Sun Apr 29 14:33:49 2001
@@ -1,14 +1,14 @@
 /* mpihelp-lshift.c  -	MPI helper functions
- *	Copyright (C) 1994, 1996, 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1994, 1996, 1998, 2001 Free Software Foundation, Inc.
  *
- * This file is part of G10.
+ * This file is part of GnuPG.
  *
- * G10 is free software; you can redistribute it and/or modify
+ * 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.
  *
- * G10 is distributed in the hope that it will be useful,
+ * 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.
diff -urN gnupg-1.0.4/mpi/generic/mpih-mul1.c gnupg-1.0.5/mpi/generic/mpih-mul1.c
--- gnupg-1.0.4/mpi/generic/mpih-mul1.c	Wed Nov 26 22:07:00 1997
+++ gnupg-1.0.5/mpi/generic/mpih-mul1.c	Sun Apr 29 14:34:12 2001
@@ -1,15 +1,14 @@
 /* mpihelp-mul_1.c  -  MPI helper functions
- *	Copyright (c) 1997 by Werner Koch (dd9jn)
- *	Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc.
  *
- * This file is part of G10.
+ * This file is part of GnuPG.
  *
- * G10 is free software; you can redistribute it and/or modify
+ * 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.
  *
- * G10 is distributed in the hope that it will be useful,
+ * 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.
diff -urN gnupg-1.0.4/mpi/generic/mpih-mul2.c gnupg-1.0.5/mpi/generic/mpih-mul2.c
--- gnupg-1.0.4/mpi/generic/mpih-mul2.c	Wed Nov 26 22:07:00 1997
+++ gnupg-1.0.5/mpi/generic/mpih-mul2.c	Sun Apr 29 14:34:53 2001
@@ -1,15 +1,14 @@
 /* mpihelp-mul_2.c  -  MPI helper functions
- *	Copyright (c) 1997 by Werner Koch (dd9jn)
- *	Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc.
  *
- * This file is part of G10.
+ * This file is part of GnuPG.
  *
- * G10 is free software; you can redistribute it and/or modify
+ * 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.
  *
- * G10 is distributed in the hope that it will be useful,
+ * 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.
diff -urN gnupg-1.0.4/mpi/generic/mpih-mul3.c gnupg-1.0.5/mpi/generic/mpih-mul3.c
--- gnupg-1.0.4/mpi/generic/mpih-mul3.c	Wed Nov 26 22:07:00 1997
+++ gnupg-1.0.5/mpi/generic/mpih-mul3.c	Sun Apr 29 14:35:20 2001
@@ -1,15 +1,14 @@
 /* mpihelp-mul_3.c  -  MPI helper functions
- *	Copyright (c) 1997 by Werner Koch (dd9jn)
- *	Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc.
  *
- * This file is part of G10.
+ * This file is part of GnuPG.
  *
- * G10 is free software; you can redistribute it and/or modify
+ * 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.
  *
- * G10 is distributed in the hope that it will be useful,
+ * 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.
diff -urN gnupg-1.0.4/mpi/generic/mpih-rshift.c gnupg-1.0.5/mpi/generic/mpih-rshift.c
--- gnupg-1.0.4/mpi/generic/mpih-rshift.c	Tue Nov 10 19:35:08 1998
+++ gnupg-1.0.5/mpi/generic/mpih-rshift.c	Tue Apr 17 13:04:19 2001
@@ -1,5 +1,6 @@
 /* mpih-rshift.c  -  MPI helper functions
- *	Copyright (C) 1994, 1996, 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1994, 1996, 1998, 1999,
+ *               2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG
  *
diff -urN gnupg-1.0.4/mpi/generic/mpih-sub1.c gnupg-1.0.5/mpi/generic/mpih-sub1.c
--- gnupg-1.0.4/mpi/generic/mpih-sub1.c	Wed Nov 26 22:07:00 1997
+++ gnupg-1.0.5/mpi/generic/mpih-sub1.c	Sun Apr 29 14:36:00 2001
@@ -1,15 +1,14 @@
 /* mpihelp-add_2.c  -  MPI helper functions
- *	Copyright (c) 1997 by Werner Koch (dd9jn)
- *	Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc.
  *
- * This file is part of G10.
+ * This file is part of GnuPG.
  *
- * G10 is free software; you can redistribute it and/or modify
+ * 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.
  *
- * G10 is distributed in the hope that it will be useful,
+ * 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.
diff -urN gnupg-1.0.4/mpi/generic/udiv-w-sdiv.c gnupg-1.0.5/mpi/generic/udiv-w-sdiv.c
--- gnupg-1.0.4/mpi/generic/udiv-w-sdiv.c	Tue Nov 10 19:35:08 1998
+++ gnupg-1.0.5/mpi/generic/udiv-w-sdiv.c	Sun Apr 29 14:36:32 2001
@@ -1,9 +1,7 @@
 /* mpihelp_udiv_w_sdiv -- implement udiv_qrnnd on machines with only signed
  *			  division.
- *
- * Contributed by Peter L. Montgomery.
- *
  * Copyright (C) 1992, 1994, 1996, 1998 Free Software Foundation, Inc.
+ * Contributed by Peter L. Montgomery.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/hppa/mpih-add1.S gnupg-1.0.5/mpi/hppa/mpih-add1.S
--- gnupg-1.0.4/mpi/hppa/mpih-add1.S	Tue Feb 24 19:50:33 1998
+++ gnupg-1.0.5/mpi/hppa/mpih-add1.S	Sun Apr 29 15:01:47 2001
@@ -1,17 +1,17 @@
 /* hppa add_n -- Add two limb vectors of the same length > 0 and store
  *		 sum in a third limb vector.
  *
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1998,
+ *                    2001 Fee Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/hppa/mpih-lshift.S gnupg-1.0.5/mpi/hppa/mpih-lshift.S
--- gnupg-1.0.4/mpi/hppa/mpih-lshift.S	Tue May 26 15:37:54 1998
+++ gnupg-1.0.5/mpi/hppa/mpih-lshift.S	Sun Apr 29 15:03:26 2001
@@ -1,15 +1,16 @@
 /* hppa   lshift
-*
- * Copyright (C) 1992, 1994, 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1998
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/hppa/mpih-rshift.S gnupg-1.0.5/mpi/hppa/mpih-rshift.S
--- gnupg-1.0.4/mpi/hppa/mpih-rshift.S	Tue May 26 15:37:54 1998
+++ gnupg-1.0.5/mpi/hppa/mpih-rshift.S	Sun Apr 29 15:03:43 2001
@@ -1,15 +1,16 @@
 /* hppa   rshift
-*
- * Copyright (C) 1992, 1994, 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/hppa/mpih-sub1.S gnupg-1.0.5/mpi/hppa/mpih-sub1.S
--- gnupg-1.0.4/mpi/hppa/mpih-sub1.S	Tue Feb 24 19:50:33 1998
+++ gnupg-1.0.5/mpi/hppa/mpih-sub1.S	Sun Apr 29 15:03:55 2001
@@ -1,16 +1,17 @@
 /* hppa   sub_n -- Sub two limb vectors of the same length > 0 and store
  *		   sum in a third limb vector.
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/hppa/udiv-qrnnd.S gnupg-1.0.5/mpi/hppa/udiv-qrnnd.S
--- gnupg-1.0.4/mpi/hppa/udiv-qrnnd.S	Tue Dec 23 18:30:16 1997
+++ gnupg-1.0.5/mpi/hppa/udiv-qrnnd.S	Sun Apr 29 14:37:57 2001
@@ -1,17 +1,16 @@
 /* HP-PA  __udiv_qrnnd division support, used from longlong.h.
  *	  This version runs fast on pre-PA7000 CPUs.
  *
- *	Copyright (C) 1993, 1994 Free Software Foundation, Inc.
- *	Copyright (c) 1997 by Werner Koch (dd9jn)
+ *      Copyright (C) 1993, 1994, 1998, 2001 Free Software Foundation, Inc.
  *
- * This file is part of G10.
+ * This file is part of GnuPG.
  *
- * G10 is free software; you can redistribute it and/or modify
+ * 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.
  *
- * G10 is distributed in the hope that it will be useful,
+ * 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.
diff -urN gnupg-1.0.4/mpi/hppa1.1/mpih-mul1.S gnupg-1.0.5/mpi/hppa1.1/mpih-mul1.S
--- gnupg-1.0.4/mpi/hppa1.1/mpih-mul1.S	Tue Feb 24 19:50:34 1998
+++ gnupg-1.0.5/mpi/hppa1.1/mpih-mul1.S	Sun Apr 29 15:04:09 2001
@@ -1,16 +1,17 @@
 /* hppa1.1  mul_1 -- Multiply a limb vector with a limb and store
  *		     the result in a second limb vector.
- *	Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1993, 1994, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/hppa1.1/mpih-mul2.S gnupg-1.0.5/mpi/hppa1.1/mpih-mul2.S
--- gnupg-1.0.4/mpi/hppa1.1/mpih-mul2.S	Tue Feb 24 19:50:34 1998
+++ gnupg-1.0.5/mpi/hppa1.1/mpih-mul2.S	Sun Apr 29 15:04:22 2001
@@ -1,16 +1,17 @@
 /* hppa1.1   addmul_1 -- Multiply a limb vector with a limb and add
  *			 the result to a second limb vector.
- *	Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1993, 1994, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/hppa1.1/mpih-mul3.S gnupg-1.0.5/mpi/hppa1.1/mpih-mul3.S
--- gnupg-1.0.4/mpi/hppa1.1/mpih-mul3.S	Tue Feb 24 19:50:34 1998
+++ gnupg-1.0.5/mpi/hppa1.1/mpih-mul3.S	Sun Apr 29 15:04:32 2001
@@ -1,16 +1,17 @@
 /* hppa1.1   submul_1 -- Multiply a limb vector with a limb and add
  *			 the result to a second limb vector.
- *	Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1993, 1994, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/hppa1.1/udiv-qrnnd.S gnupg-1.0.5/mpi/hppa1.1/udiv-qrnnd.S
--- gnupg-1.0.4/mpi/hppa1.1/udiv-qrnnd.S	Fri Sep 18 17:24:52 1998
+++ gnupg-1.0.5/mpi/hppa1.1/udiv-qrnnd.S	Sun Apr 29 15:04:42 2001
@@ -1,17 +1,17 @@
 /* HP-PA  __udiv_qrnnd division support, used from longlong.h.
  *	  This version runs fast on PA 7000 and later.
  *
- *	Copyright (C) 1993, 1994 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1993, 1994, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/i386/mpih-add1.S gnupg-1.0.5/mpi/i386/mpih-add1.S
--- gnupg-1.0.4/mpi/i386/mpih-add1.S	Tue Feb 24 19:50:35 1998
+++ gnupg-1.0.5/mpi/i386/mpih-add1.S	Sun Apr 29 15:04:57 2001
@@ -1,17 +1,17 @@
 /* i80386 add_n -- Add two limb vectors of the same length > 0 and store
  *		   sum in a third limb vector.
  *
- *	Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1995, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/i386/mpih-lshift.S gnupg-1.0.5/mpi/i386/mpih-lshift.S
--- gnupg-1.0.4/mpi/i386/mpih-lshift.S	Tue May 26 15:37:54 1998
+++ gnupg-1.0.5/mpi/i386/mpih-lshift.S	Sun Apr 29 15:05:07 2001
@@ -1,15 +1,15 @@
 /* i80386   lshift
- *	Copyright (C) 1998 Free Software Foundation, Inc.
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/i386/mpih-mul1.S gnupg-1.0.5/mpi/i386/mpih-mul1.S
--- gnupg-1.0.4/mpi/i386/mpih-mul1.S	Tue Feb 24 19:50:38 1998
+++ gnupg-1.0.5/mpi/i386/mpih-mul1.S	Sun Apr 29 15:05:21 2001
@@ -1,16 +1,16 @@
 /* i80386 mul_1 -- Multiply a limb vector with a limb and store
  *			 the result in a second limb vector.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/i386/mpih-mul2.S gnupg-1.0.5/mpi/i386/mpih-mul2.S
--- gnupg-1.0.4/mpi/i386/mpih-mul2.S	Tue Feb 24 19:50:38 1998
+++ gnupg-1.0.5/mpi/i386/mpih-mul2.S	Sun Apr 29 15:06:03 2001
@@ -1,16 +1,17 @@
 /* i80386 addmul_1 -- Multiply a limb vector with a limb and add
  *		      the result to a second limb vector.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/i386/mpih-mul3.S gnupg-1.0.5/mpi/i386/mpih-mul3.S
--- gnupg-1.0.4/mpi/i386/mpih-mul3.S	Tue Feb 24 19:50:39 1998
+++ gnupg-1.0.5/mpi/i386/mpih-mul3.S	Sun Apr 29 15:06:29 2001
@@ -1,16 +1,17 @@
 /* i80386 submul_1 -- Multiply a limb vector with a limb and add
  *		      the result to a second limb vector.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/i386/mpih-rshift.S gnupg-1.0.5/mpi/i386/mpih-rshift.S
--- gnupg-1.0.4/mpi/i386/mpih-rshift.S	Tue May 26 15:37:54 1998
+++ gnupg-1.0.5/mpi/i386/mpih-rshift.S	Sun Apr 29 15:06:44 2001
@@ -1,15 +1,16 @@
 /* i80386   rshift
- *	Copyright (C) 1998 Free Software Foundation, Inc.
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/i386/mpih-sub1.S gnupg-1.0.5/mpi/i386/mpih-sub1.S
--- gnupg-1.0.4/mpi/i386/mpih-sub1.S	Tue Feb 24 19:50:39 1998
+++ gnupg-1.0.5/mpi/i386/mpih-sub1.S	Sun Apr 29 15:06:53 2001
@@ -1,16 +1,17 @@
 /* i80386 sub_n -- Sub two limb vectors of the same length > 0 and store
  *		   sum in a third limb vector.
- *	Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1995, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/i386/syntax.h gnupg-1.0.5/mpi/i386/syntax.h
--- gnupg-1.0.4/mpi/i386/syntax.h	Wed Nov 26 22:07:07 1997
+++ gnupg-1.0.5/mpi/i386/syntax.h	Sun Apr 29 14:39:02 2001
@@ -1,24 +1,30 @@
-/* asm.h -- Definitions for x86 syntax variations.
-
-Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-The GNU MP Library 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 Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA.  */
-
+/* syntax.h -- Definitions for x86 syntax variations.
+ *
+ *       Copyright (C) 1992, 1994, 1995, 1998, 
+ *                     2001 Free Software Foundation, Inc.
+ *
+ * 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
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
 #undef ALIGN
 
diff -urN gnupg-1.0.4/mpi/i586/mpih-add1.S gnupg-1.0.5/mpi/i586/mpih-add1.S
--- gnupg-1.0.4/mpi/i586/mpih-add1.S	Tue Feb 24 19:50:40 1998
+++ gnupg-1.0.5/mpi/i586/mpih-add1.S	Sun Apr 29 15:07:03 2001
@@ -1,16 +1,17 @@
 /* i80586 add_n -- Add two limb vectors of the same length > 0 and store
  *		   sum in a third limb vector.
  *
- *	Copyright (C) 1992, 1994, 1995, 1996 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1995, 1996, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/i586/mpih-lshift.S gnupg-1.0.5/mpi/i586/mpih-lshift.S
--- gnupg-1.0.4/mpi/i586/mpih-lshift.S	Tue May 26 15:37:55 1998
+++ gnupg-1.0.5/mpi/i586/mpih-lshift.S	Sun Apr 29 15:07:14 2001
@@ -1,15 +1,16 @@
 /* i80586   lshift
- *	Copyright (C) 1998 Free Software Foundation, Inc.
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/i586/mpih-mul1.S gnupg-1.0.5/mpi/i586/mpih-mul1.S
--- gnupg-1.0.4/mpi/i586/mpih-mul1.S	Tue Feb 24 19:50:40 1998
+++ gnupg-1.0.5/mpi/i586/mpih-mul1.S	Sun Apr 29 15:07:23 2001
@@ -1,15 +1,17 @@
 /* i80586 mul_1 -- Multiply a limb vector with a limb and store
  *			 the result in a second limb vector.
- *	Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1996, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/i586/mpih-mul2.S gnupg-1.0.5/mpi/i586/mpih-mul2.S
--- gnupg-1.0.4/mpi/i586/mpih-mul2.S	Tue Feb 24 19:50:40 1998
+++ gnupg-1.0.5/mpi/i586/mpih-mul2.S	Sun Apr 29 15:07:32 2001
@@ -1,16 +1,17 @@
 /* i80586 addmul_1 -- Multiply a limb vector with a limb and add
  *		      the result to a second limb vector.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/i586/mpih-mul3.S gnupg-1.0.5/mpi/i586/mpih-mul3.S
--- gnupg-1.0.4/mpi/i586/mpih-mul3.S	Tue Feb 24 19:50:40 1998
+++ gnupg-1.0.5/mpi/i586/mpih-mul3.S	Sun Apr 29 15:07:42 2001
@@ -1,16 +1,17 @@
 /* i80586 submul_1 -- Multiply a limb vector with a limb and add
  *		      the result to a second limb vector.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/i586/mpih-rshift.S gnupg-1.0.5/mpi/i586/mpih-rshift.S
--- gnupg-1.0.4/mpi/i586/mpih-rshift.S	Tue May 26 15:37:57 1998
+++ gnupg-1.0.5/mpi/i586/mpih-rshift.S	Sun Apr 29 15:08:00 2001
@@ -1,15 +1,16 @@
 /* i80586   rshift
- *	Copyright (C) 1998 Free Software Foundation, Inc.
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/i586/mpih-sub1.S gnupg-1.0.5/mpi/i586/mpih-sub1.S
--- gnupg-1.0.4/mpi/i586/mpih-sub1.S	Tue Feb 24 19:50:40 1998
+++ gnupg-1.0.5/mpi/i586/mpih-sub1.S	Sun Apr 29 15:08:10 2001
@@ -1,16 +1,17 @@
 /* i80586 sub_n -- Sub two limb vectors of the same length > 0 and store
  *		   sum in a third limb vector.
- *	Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1995, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/longlong.h gnupg-1.0.5/mpi/longlong.h
--- gnupg-1.0.4/mpi/longlong.h	Wed Mar  8 18:34:34 2000
+++ gnupg-1.0.5/mpi/longlong.h	Sun Apr 29 13:37:02 2001
@@ -1,7 +1,8 @@
 /* longlong.h -- definitions for mixed size 32/64 bit arithmetic.
-   Note: I added some stuff for use with g10
+   Note: I added some stuff for use with gnupg
 
-Copyright (C) 1991, 1992, 1993, 1994, 1996 Free Software Foundation, Inc.
+Copyright (C) 1991, 1992, 1993, 1994, 1996, 1998,
+              2000 Free Software Foundation, Inc.
 
 This file is free software; you can redistribute it and/or modify
 it under the terms of the GNU Library General Public License as published by
diff -urN gnupg-1.0.4/mpi/m68k/mc68020/mpih-mul1.S gnupg-1.0.5/mpi/m68k/mc68020/mpih-mul1.S
--- gnupg-1.0.4/mpi/m68k/mc68020/mpih-mul1.S	Tue Feb 17 21:48:52 1998
+++ gnupg-1.0.5/mpi/m68k/mc68020/mpih-mul1.S	Sun Apr 29 14:45:54 2001
@@ -1,24 +1,33 @@
 /* mc68020 __mpn_mul_1 -- Multiply a limb vector with a limb and store
-   the result in a second limb vector.
-
-Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-The GNU MP Library 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 Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA. */
+ *                        the result in a second limb vector.
+ *
+ *      Copyright (C) 1992, 1994, 1996, 1998,
+ *                    2001 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
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
 
 
diff -urN gnupg-1.0.4/mpi/m68k/mc68020/mpih-mul2.S gnupg-1.0.5/mpi/m68k/mc68020/mpih-mul2.S
--- gnupg-1.0.4/mpi/m68k/mc68020/mpih-mul2.S	Tue Feb 17 21:48:52 1998
+++ gnupg-1.0.5/mpi/m68k/mc68020/mpih-mul2.S	Sun Apr 29 14:46:16 2001
@@ -1,24 +1,33 @@
 /* mc68020 __mpn_addmul_1 -- Multiply a limb vector with a limb and add
-   the result to a second limb vector.
-
-Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-The GNU MP Library 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 Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA. */
+ *                           the result to a second limb vector.
+ *
+ *      Copyright (C) 1992, 1994, 1996, 1998, 
+ *                    2001 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
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
 
 #include "sysdep.h"
diff -urN gnupg-1.0.4/mpi/m68k/mc68020/mpih-mul3.S gnupg-1.0.5/mpi/m68k/mc68020/mpih-mul3.S
--- gnupg-1.0.4/mpi/m68k/mc68020/mpih-mul3.S	Tue Feb 17 21:48:52 1998
+++ gnupg-1.0.5/mpi/m68k/mc68020/mpih-mul3.S	Sun Apr 29 14:46:32 2001
@@ -1,24 +1,34 @@
 /* mc68020 __mpn_submul_1 -- Multiply a limb vector with a limb and subtract
-   the result from a second limb vector.
+ *                           the result from a second limb vector.
+ *
+ *      Copyright (C) 1992, 1994, 1996, 1998, 
+ *                    2001 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
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
-Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-The GNU MP Library 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 Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA. */
 
 
 
diff -urN gnupg-1.0.4/mpi/m68k/mpih-add1.S gnupg-1.0.5/mpi/m68k/mpih-add1.S
--- gnupg-1.0.4/mpi/m68k/mpih-add1.S	Tue Feb 17 21:48:51 1998
+++ gnupg-1.0.5/mpi/m68k/mpih-add1.S	Sun Apr 29 14:40:02 2001
@@ -1,24 +1,33 @@
 /* mc68020 __mpn_add_n -- Add two limb vectors of the same length > 0 and store
-   sum in a third limb vector.
-
-Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-The GNU MP Library 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 Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA. */
+ *                        sum in a third limb vector.
+ *
+ *      Copyright (C) 1992, 1994,1996, 1998, 
+ *                    2001 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
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
 
 #include "sysdep.h"
diff -urN gnupg-1.0.4/mpi/m68k/mpih-lshift.S gnupg-1.0.5/mpi/m68k/mpih-lshift.S
--- gnupg-1.0.4/mpi/m68k/mpih-lshift.S	Tue May 26 15:37:57 1998
+++ gnupg-1.0.5/mpi/m68k/mpih-lshift.S	Sun Apr 29 14:40:35 2001
@@ -1,24 +1,32 @@
 /* mc68020 lshift -- Shift left a low-level natural-number integer.
+ *
+ *      Copyright (C) 1996, 1998, 2001 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
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
-Copyright (C) 1996, 1998 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 Library 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 Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA.
-*/
 
 #include "sysdep.h"
 #include "asm-syntax.h"
diff -urN gnupg-1.0.4/mpi/m68k/mpih-rshift.S gnupg-1.0.5/mpi/m68k/mpih-rshift.S
--- gnupg-1.0.4/mpi/m68k/mpih-rshift.S	Tue May 26 15:37:57 1998
+++ gnupg-1.0.5/mpi/m68k/mpih-rshift.S	Sun Apr 29 14:43:36 2001
@@ -1,24 +1,32 @@
 /* mc68020 rshift -- Shift right a low-level natural-number integer.
+ *
+ *      Copyright (C) 1996, 1998, 2001 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
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
-Copyright (C) 1996, 1998 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 Library 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 Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA.
-*/
 
 #include "sysdep.h"
 #include "asm-syntax.h"
diff -urN gnupg-1.0.4/mpi/m68k/mpih-sub1.S gnupg-1.0.5/mpi/m68k/mpih-sub1.S
--- gnupg-1.0.4/mpi/m68k/mpih-sub1.S	Tue Feb 17 21:48:51 1998
+++ gnupg-1.0.5/mpi/m68k/mpih-sub1.S	Sun Apr 29 14:44:10 2001
@@ -1,25 +1,33 @@
 /* mc68020 __mpn_sub_n -- Subtract two limb vectors of the same length > 0 and
-   store difference in a third limb vector.
-
-Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-The GNU MP Library 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 Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA. */
-
+ *                        store difference in a third limb vector.
+ *
+ *      Copyright (C) 1992, 1994, 1996, 1998, 
+ *                    2001 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
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
 #include "sysdep.h"
 #include "asm-syntax.h"
diff -urN gnupg-1.0.4/mpi/m68k/syntax.h gnupg-1.0.5/mpi/m68k/syntax.h
--- gnupg-1.0.4/mpi/m68k/syntax.h	Mon Feb 16 21:05:00 1998
+++ gnupg-1.0.5/mpi/m68k/syntax.h	Sun Apr 29 14:45:02 2001
@@ -1,23 +1,33 @@
 /* asm.h -- Definitions for 68k syntax variations.
+ *
+ *      Copyright (C) 1992, 1994, 1996, 1998,
+ *                    2001 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
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
-Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-The GNU MP Library 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 Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA.  */
 
 #undef ALIGN
 
diff -urN gnupg-1.0.4/mpi/mips3/mpih-add1.S gnupg-1.0.5/mpi/mips3/mpih-add1.S
--- gnupg-1.0.4/mpi/mips3/mpih-add1.S	Thu Jun 25 12:19:06 1998
+++ gnupg-1.0.5/mpi/mips3/mpih-add1.S	Sun Apr 29 15:17:44 2001
@@ -1,15 +1,17 @@
 /* mips3  add_n -- Add two limb vectors of the same length > 0 and store
  *		   sum in a third limb vector.
- *	Copyright (C) 1995, 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1995, 1998, 2000
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/mips3/mpih-lshift.S gnupg-1.0.5/mpi/mips3/mpih-lshift.S
--- gnupg-1.0.4/mpi/mips3/mpih-lshift.S	Thu Jun 25 12:19:06 1998
+++ gnupg-1.0.5/mpi/mips3/mpih-lshift.S	Sun Apr 29 15:17:34 2001
@@ -1,14 +1,16 @@
 /* mips3    lshift
- *	Copyright (C) 1995, 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1995, 1998, 2000,
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/mips3/mpih-mul1.S gnupg-1.0.5/mpi/mips3/mpih-mul1.S
--- gnupg-1.0.4/mpi/mips3/mpih-mul1.S	Thu Jun 25 12:19:06 1998
+++ gnupg-1.0.5/mpi/mips3/mpih-mul1.S	Sun Apr 29 15:18:01 2001
@@ -1,15 +1,17 @@
 /* mips3 mpih-mul1.S -- Multiply a limb vector with a limb and store
  *			the result in a second limb vector.
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1995, 1998, 2000
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
@@ -36,10 +38,10 @@
 	.set	noreorder
 	.set	nomacro
 
- # warm up phase 0
+/* # warm up phase 0 */
 	ld	$8,0($5)
 
- # warm up phase 1
+/* # warm up phase 1 */
 	daddiu	$5,$5,8
 	dmultu	$8,$7
 
@@ -64,7 +66,7 @@
 	bne	$6,$0,Loop
 	 daddu	$2,$9,$2	# add high product limb and carry from addition
 
- # cool down phase 1
+/* # cool down phase 1 */
 $LC1:	mflo	$10
 	mfhi	$9
 	daddu	$10,$10,$2
@@ -74,7 +76,7 @@
 	daddiu	$4,$4,8
 	daddu	$2,$9,$2	# add high product limb and carry from addition
 
- # cool down phase 0
+/* # cool down phase 0 */
 $LC0:	mflo	$10
 	mfhi	$9
 	daddu	$10,$10,$2
diff -urN gnupg-1.0.4/mpi/mips3/mpih-mul2.S gnupg-1.0.5/mpi/mips3/mpih-mul2.S
--- gnupg-1.0.4/mpi/mips3/mpih-mul2.S	Thu Jun 25 12:19:06 1998
+++ gnupg-1.0.5/mpi/mips3/mpih-mul2.S	Sun Apr 29 15:18:08 2001
@@ -1,15 +1,17 @@
 /* MIPS3   addmul_1 -- Multiply a limb vector with a single limb and
  *		       add the product to a second limb vector.
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1995, 1998, 2000
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
@@ -36,10 +38,10 @@
 	.set	noreorder
 	.set	nomacro
 
- # warm up phase 0
+/* # warm up phase 0 */
 	ld	$8,0($5)
 
- # warm up phase 1
+/* # warm up phase 1 */
 	daddiu	$5,$5,8
 	dmultu	$8,$7
 
@@ -68,7 +70,7 @@
 	bne	$6,$0,Loop
 	 daddu	$2,$9,$2	# add high product limb and carry from addition
 
- # cool down phase 1
+/* # cool down phase 1 */
 $LC1:	ld	$10,0($4)
 	mflo	$3
 	mfhi	$9
@@ -82,7 +84,7 @@
 	daddiu	$4,$4,8
 	daddu	$2,$9,$2	# add high product limb and carry from addition
 
- # cool down phase 0
+/* # cool down phase 0 */
 $LC0:	ld	$10,0($4)
 	mflo	$3
 	mfhi	$9
diff -urN gnupg-1.0.4/mpi/mips3/mpih-mul3.S gnupg-1.0.5/mpi/mips3/mpih-mul3.S
--- gnupg-1.0.4/mpi/mips3/mpih-mul3.S	Thu Jun 25 12:19:06 1998
+++ gnupg-1.0.5/mpi/mips3/mpih-mul3.S	Sun Apr 29 15:18:15 2001
@@ -1,15 +1,17 @@
 /* MIPS3 submul_1 -- Multiply a limb vector with a single limb and
  *		     subtract the product from a second limb vector.
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1995, 1998, 2000
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
@@ -36,10 +38,10 @@
 	.set	noreorder
 	.set	nomacro
 
- # warm up phase 0
+/* # warm up phase 0 */
 	ld	$8,0($5)
 
- # warm up phase 1
+/* # warm up phase 1 */
 	daddiu	$5,$5,8
 	dmultu	$8,$7
 
@@ -68,7 +70,7 @@
 	bne	$6,$0,Loop
 	 daddu	$2,$9,$2	# add high product limb and carry from addition
 
- # cool down phase 1
+/* # cool down phase 1 */
 $LC1:	ld	$10,0($4)
 	mflo	$3
 	mfhi	$9
@@ -82,7 +84,7 @@
 	daddiu	$4,$4,8
 	daddu	$2,$9,$2	# add high product limb and carry from addition
 
- # cool down phase 0
+/* # cool down phase 0 */
 $LC0:	ld	$10,0($4)
 	mflo	$3
 	mfhi	$9
diff -urN gnupg-1.0.4/mpi/mips3/mpih-rshift.S gnupg-1.0.5/mpi/mips3/mpih-rshift.S
--- gnupg-1.0.4/mpi/mips3/mpih-rshift.S	Thu Jun 25 12:19:06 1998
+++ gnupg-1.0.5/mpi/mips3/mpih-rshift.S	Sun Apr 29 15:18:27 2001
@@ -1,14 +1,16 @@
 /* mips3    rshift
- *	Copyright (C) 1995, 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1995, 1998, 2000
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/mips3/mpih-sub1.S gnupg-1.0.5/mpi/mips3/mpih-sub1.S
--- gnupg-1.0.4/mpi/mips3/mpih-sub1.S	Wed Feb 24 11:12:28 1999
+++ gnupg-1.0.5/mpi/mips3/mpih-sub1.S	Sun Apr 29 15:18:43 2001
@@ -1,15 +1,17 @@
 /* mips3  sub_n -- Subtract two limb vectors of the same length > 0 and
  *		  store difference in a third limb vector.
- * Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+ * 
+ *      Copyright (C) 1995, 1998, 1999, 2000,
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/mpi-add.c gnupg-1.0.5/mpi/mpi-add.c
--- gnupg-1.0.4/mpi/mpi-add.c	Wed Dec 23 13:41:29 1998
+++ gnupg-1.0.5/mpi/mpi-add.c	Tue Apr 17 12:53:06 2001
@@ -1,5 +1,5 @@
 /* mpi-add.c  -  MPI functions
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *	Copyright (C) 1994, 1996 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
diff -urN gnupg-1.0.4/mpi/mpi-bit.c gnupg-1.0.5/mpi/mpi-bit.c
--- gnupg-1.0.4/mpi/mpi-bit.c	Fri Jul  2 11:50:56 1999
+++ gnupg-1.0.5/mpi/mpi-bit.c	Sun Apr 29 13:38:12 2001
@@ -1,5 +1,5 @@
 /* mpi-bit.c  -  MPI bit level fucntions
- *	Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/mpi-cmp.c gnupg-1.0.5/mpi/mpi-cmp.c
--- gnupg-1.0.4/mpi/mpi-cmp.c	Sat Jan  9 16:06:57 1999
+++ gnupg-1.0.5/mpi/mpi-cmp.c	Sun Apr 29 13:39:01 2001
@@ -1,5 +1,5 @@
 /* mpi-cmp.c  -  MPI functions
- *	Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/mpi-div.c gnupg-1.0.5/mpi/mpi-div.c
--- gnupg-1.0.4/mpi/mpi-div.c	Wed Dec 23 13:41:29 1998
+++ gnupg-1.0.5/mpi/mpi-div.c	Sat Apr 28 18:56:21 2001
@@ -1,6 +1,6 @@
 /* mpi-div.c  -  MPI functions
- *	Copyright (C) 1998 Free Software Foundation, Inc.
  *	Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/mpi-gcd.c gnupg-1.0.5/mpi/mpi-gcd.c
--- gnupg-1.0.4/mpi/mpi-gcd.c	Wed Dec 23 13:41:29 1998
+++ gnupg-1.0.5/mpi/mpi-gcd.c	Tue Apr 17 12:53:59 2001
@@ -1,5 +1,5 @@
 /* mpi-gcd.c  -  MPI functions
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/mpi-inline.c gnupg-1.0.5/mpi/mpi-inline.c
--- gnupg-1.0.4/mpi/mpi-inline.c	Mon Apr 26 17:53:01 1999
+++ gnupg-1.0.5/mpi/mpi-inline.c	Tue Apr 17 12:54:16 2001
@@ -1,5 +1,5 @@
 /* mpi-inline.c
- *	Copyright (C) 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/mpi-inline.h gnupg-1.0.5/mpi/mpi-inline.h
--- gnupg-1.0.4/mpi/mpi-inline.h	Mon Apr 26 17:53:01 1999
+++ gnupg-1.0.5/mpi/mpi-inline.h	Sun Apr 29 13:39:51 2001
@@ -1,6 +1,5 @@
 /* mpi-inline.h  -  Internal to the Multi Precision Integers
- *	Copyright (C) 1998, 1999 Free Software Foundation, Inc.
- *	Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ *	Copyright (C) 1994, 1996, 1998, 1999 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/mpi-internal.h gnupg-1.0.5/mpi/mpi-internal.h
--- gnupg-1.0.4/mpi/mpi-internal.h	Thu Jan 13 19:27:37 2000
+++ gnupg-1.0.5/mpi/mpi-internal.h	Sun Apr 29 13:40:14 2001
@@ -1,6 +1,6 @@
 /* mpi-internal.h  -  Internal to the Multi Precision Integers
- *	Copyright (C) 1998 Free Software Foundation, Inc.
  *	Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 2000 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/mpi-inv.c gnupg-1.0.5/mpi/mpi-inv.c
--- gnupg-1.0.4/mpi/mpi-inv.c	Wed Dec 23 13:41:29 1998
+++ gnupg-1.0.5/mpi/mpi-inv.c	Tue Apr 17 12:54:30 2001
@@ -1,5 +1,5 @@
 /* mpi-inv.c  -  MPI functions
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/mpi-mpow.c gnupg-1.0.5/mpi/mpi-mpow.c
--- gnupg-1.0.4/mpi/mpi-mpow.c	Thu Jan 13 19:27:37 2000
+++ gnupg-1.0.5/mpi/mpi-mpow.c	Sun Apr 29 13:44:06 2001
@@ -1,5 +1,5 @@
 /* mpi-mpow.c  -  MPI functions
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/mpi-mul.c gnupg-1.0.5/mpi/mpi-mul.c
--- gnupg-1.0.4/mpi/mpi-mul.c	Fri Jul  2 11:50:57 1999
+++ gnupg-1.0.5/mpi/mpi-mul.c	Sun Apr 29 13:41:39 2001
@@ -1,6 +1,6 @@
 /* mpi-mul.c  -  MPI functions
- *	Copyright (C) 1998 Free Software Foundation, Inc.
  *	Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -120,6 +120,7 @@
     int assign_wp=0;
     mpi_ptr_t tmp_limb=NULL;
 
+
     if( u->nlimbs < v->nlimbs ) { /* Swap U and V. */
 	usize = v->nlimbs;
 	usign = v->sign;
@@ -145,7 +146,15 @@
 
     /* Ensure W has space enough to store the result.  */
     wsize = usize + vsize;
-    if( w->alloced < wsize ) {
+    if ( !mpi_is_secure (w) && (mpi_is_secure (u) || mpi_is_secure (v)) ) {
+        /* w is not allocated in secure space but u or v is.  To make sure
+         * that no temporray results are stored in w, we temporary use 
+         * a newly allocated limb space for w */
+        wp = mpi_alloc_limb_space( wsize, 1 );
+        assign_wp = 2; /* mark it as 2 so that we can later copy it back to
+                        * mormal memory */
+    }
+    else if( w->alloced < wsize ) {
 	if( wp == up || wp == vp ) {
 	    wp = mpi_alloc_limb_space( wsize, mpi_is_secure(w) );
 	    assign_wp = 1;
@@ -180,8 +189,16 @@
 	wsize -= cy? 0:1;
     }
 
-    if( assign_wp )
+    if( assign_wp ) {
+        if (assign_wp == 2) {
+            /* copy the temp wp from secure memory back to normal memory */
+	    mpi_ptr_t tmp_wp = mpi_alloc_limb_space (wsize, 0);
+	    MPN_COPY (tmp_wp, wp, wsize);
+            mpi_free_limb_space (wp);
+            wp = tmp_wp;
+        }
 	mpi_assign_limb_space( w, wp, wsize );
+    }
     w->nlimbs = wsize;
     w->sign = sign_product;
     if( tmp_limb )
diff -urN gnupg-1.0.4/mpi/mpi-pow.c gnupg-1.0.5/mpi/mpi-pow.c
--- gnupg-1.0.4/mpi/mpi-pow.c	Thu Jan 13 19:27:37 2000
+++ gnupg-1.0.5/mpi/mpi-pow.c	Sun Apr 29 13:42:51 2001
@@ -1,6 +1,5 @@
 /* mpi-pow.c  -  MPI functions
- *	Copyright (C) 1998 Free Software Foundation, Inc.
- *	Copyright (C) 1994, 1996, 2000 Free Software Foundation, Inc.
+ *	Copyright (C) 1994, 1996, 1998, 2000 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/mpi-scan.c gnupg-1.0.5/mpi/mpi-scan.c
--- gnupg-1.0.4/mpi/mpi-scan.c	Tue Feb 16 14:16:30 1999
+++ gnupg-1.0.5/mpi/mpi-scan.c	Tue Apr 17 12:55:08 2001
@@ -1,5 +1,5 @@
 /* mpi-scan.c  -  MPI functions
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/mpicoder.c gnupg-1.0.5/mpi/mpicoder.c
--- gnupg-1.0.4/mpi/mpicoder.c	Wed Jul  7 13:28:12 1999
+++ gnupg-1.0.5/mpi/mpicoder.c	Sun Apr 29 13:44:57 2001
@@ -1,5 +1,5 @@
 /* mpicoder.c  -  Coder for the external representation of MPIs
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/mpih-cmp.c gnupg-1.0.5/mpi/mpih-cmp.c
--- gnupg-1.0.4/mpi/mpih-cmp.c	Wed Dec 23 13:41:30 1998
+++ gnupg-1.0.5/mpi/mpih-cmp.c	Sat Apr 28 18:56:54 2001
@@ -1,6 +1,6 @@
 /* mpihelp-sub.c  -  MPI helper functions
- *	Copyright (C) 1998 Free Software Foundation, Inc.
  *	Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/mpih-div.c gnupg-1.0.5/mpi/mpih-div.c
--- gnupg-1.0.4/mpi/mpih-div.c	Thu Dec  9 10:32:20 1999
+++ gnupg-1.0.5/mpi/mpih-div.c	Sun Apr 29 13:46:53 2001
@@ -1,6 +1,6 @@
 /* mpihelp-div.c  -  MPI helper functions
- *	Copyright (C) 1998 Free Software Foundation, Inc.
  *	Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/mpih-mul.c gnupg-1.0.5/mpi/mpih-mul.c
--- gnupg-1.0.4/mpi/mpih-mul.c	Wed Mar  8 18:34:34 2000
+++ gnupg-1.0.5/mpi/mpih-mul.c	Sun Apr 29 13:47:35 2001
@@ -1,5 +1,6 @@
 /* mpihelp-mul.c  -  MPI helper functions
- * Copyright (C) 1994, 1996, 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1994, 1996, 1998, 1999,
+ *               2000 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/mpiutil.c gnupg-1.0.5/mpi/mpiutil.c
--- gnupg-1.0.4/mpi/mpiutil.c	Tue Jun  1 16:08:55 1999
+++ gnupg-1.0.5/mpi/mpiutil.c	Sun Apr 29 13:48:05 2001
@@ -1,5 +1,5 @@
 /* mpiutil.ac  -  Utility functions for MPI
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/pa7100/mpih-lshift.S gnupg-1.0.5/mpi/pa7100/mpih-lshift.S
--- gnupg-1.0.4/mpi/pa7100/mpih-lshift.S	Tue May 26 15:37:58 1998
+++ gnupg-1.0.5/mpi/pa7100/mpih-lshift.S	Sun Apr 29 15:09:52 2001
@@ -1,16 +1,17 @@
 /* hppa   lshift
  *	  optimized for the PA7100, where is runs at 3.25 cycles/limb
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ * 
+ *      Copyright (C) 1992, 1994, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/pa7100/mpih-rshift.S gnupg-1.0.5/mpi/pa7100/mpih-rshift.S
--- gnupg-1.0.4/mpi/pa7100/mpih-rshift.S	Tue May 26 15:37:58 1998
+++ gnupg-1.0.5/mpi/pa7100/mpih-rshift.S	Sun Apr 29 15:09:59 2001
@@ -1,16 +1,17 @@
 /* hppa   rshift
  *	  optimized for the PA7100, where is runs at 3.25 cycles/limb
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/power/mpih-add1.S gnupg-1.0.5/mpi/power/mpih-add1.S
--- gnupg-1.0.4/mpi/power/mpih-add1.S	Sun Dec 19 15:23:19 1999
+++ gnupg-1.0.5/mpi/power/mpih-add1.S	Sun Apr 29 15:20:43 2001
@@ -1,6 +1,6 @@
 /* IBM POWER add_n -- Add two limb vectors of equal, non-zero length.
  *
- * Copyright (C) 1992, 1994, 1995, 1996, 1999 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1996, 1999 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/power/mpih-lshift.S gnupg-1.0.5/mpi/power/mpih-lshift.S
--- gnupg-1.0.4/mpi/power/mpih-lshift.S	Sun Dec 19 15:23:19 1999
+++ gnupg-1.0.5/mpi/power/mpih-lshift.S	Sun Apr 29 15:10:38 2001
@@ -1,6 +1,6 @@
 /* IBM POWER lshift
  *
- * Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/power/mpih-mul1.S gnupg-1.0.5/mpi/power/mpih-mul1.S
--- gnupg-1.0.4/mpi/power/mpih-mul1.S	Sun Dec 19 15:23:19 1999
+++ gnupg-1.0.5/mpi/power/mpih-mul1.S	Sun Apr 29 15:11:07 2001
@@ -1,7 +1,7 @@
 /* IBM POWER  mul_1 -- Multiply a limb vector with a limb and store
- * the result in a second limb vector.
+ *                     the result in a second limb vector.
  *
- * Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/power/mpih-mul2.S gnupg-1.0.5/mpi/power/mpih-mul2.S
--- gnupg-1.0.4/mpi/power/mpih-mul2.S	Sun Dec 19 15:23:19 1999
+++ gnupg-1.0.5/mpi/power/mpih-mul2.S	Sun Apr 29 15:11:14 2001
@@ -1,7 +1,7 @@
 /* IBM POWER addmul_1 -- Multiply a limb vector with a limb and add
  *			 the result to a second limb vector.
  *
- * Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/power/mpih-mul3.S gnupg-1.0.5/mpi/power/mpih-mul3.S
--- gnupg-1.0.4/mpi/power/mpih-mul3.S	Sun Dec 19 15:23:19 1999
+++ gnupg-1.0.5/mpi/power/mpih-mul3.S	Sun Apr 29 15:11:26 2001
@@ -1,7 +1,7 @@
 /* IBM POWER submul_1 -- Multiply a limb vector with a limb and subtract
  *			 the result from a second limb vector.
  *
- * Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/power/mpih-rshift.S gnupg-1.0.5/mpi/power/mpih-rshift.S
--- gnupg-1.0.4/mpi/power/mpih-rshift.S	Sun Dec 19 15:23:19 1999
+++ gnupg-1.0.5/mpi/power/mpih-rshift.S	Sun Apr 29 15:11:35 2001
@@ -1,6 +1,6 @@
 /* IBM POWER rshift
  *
- * Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/power/mpih-sub1.S gnupg-1.0.5/mpi/power/mpih-sub1.S
--- gnupg-1.0.4/mpi/power/mpih-sub1.S	Sun Dec 19 15:23:19 1999
+++ gnupg-1.0.5/mpi/power/mpih-sub1.S	Sun Apr 29 15:11:52 2001
@@ -1,6 +1,7 @@
 /* IBM POWER sub_n -- Subtract two limb vectors of equal, non-zero length.
  *
- * Copyright (C) 1992, 1994, 1995, 1996, 1999 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1995, 1996, 1999
+ *                    Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/powerpc32/mpih-add1.S gnupg-1.0.5/mpi/powerpc32/mpih-add1.S
--- gnupg-1.0.4/mpi/powerpc32/mpih-add1.S	Tue Dec  8 13:20:46 1998
+++ gnupg-1.0.5/mpi/powerpc32/mpih-add1.S	Sun Apr 29 15:12:37 2001
@@ -1,6 +1,6 @@
 /* PowerPC-32 add_n -- Add two limb vectors of equal, non-zero length.
  *
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/powerpc32/mpih-lshift.S gnupg-1.0.5/mpi/powerpc32/mpih-lshift.S
--- gnupg-1.0.4/mpi/powerpc32/mpih-lshift.S	Tue Dec  8 13:20:46 1998
+++ gnupg-1.0.5/mpi/powerpc32/mpih-lshift.S	Sun Apr 29 15:12:26 2001
@@ -1,6 +1,6 @@
 /* PowerPC-32 lshift
  *
- *	Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1995, 1998 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/powerpc32/mpih-mul1.S gnupg-1.0.5/mpi/powerpc32/mpih-mul1.S
--- gnupg-1.0.4/mpi/powerpc32/mpih-mul1.S	Tue Dec  8 13:20:46 1998
+++ gnupg-1.0.5/mpi/powerpc32/mpih-mul1.S	Sun Apr 29 15:13:03 2001
@@ -1,7 +1,8 @@
 /* PowerPC-32 mul_1 -- Multiply a limb vector with a limb and store
  *		       the result in a second limb vector.
  *
- * Copyright (C) 1993, 1994, 1995, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1993, 1994, 1995,
+ *                    1998 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/powerpc32/mpih-mul2.S gnupg-1.0.5/mpi/powerpc32/mpih-mul2.S
--- gnupg-1.0.4/mpi/powerpc32/mpih-mul2.S	Tue Dec  8 13:20:46 1998
+++ gnupg-1.0.5/mpi/powerpc32/mpih-mul2.S	Sun Apr 29 15:13:14 2001
@@ -1,7 +1,7 @@
 /* PowerPC-32 addmul_1 -- Multiply a limb vector with a limb and add
  *			  the result to a second limb vector.
  *
- * Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1995, 1998 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/powerpc32/mpih-mul3.S gnupg-1.0.5/mpi/powerpc32/mpih-mul3.S
--- gnupg-1.0.4/mpi/powerpc32/mpih-mul3.S	Tue Dec  8 13:20:46 1998
+++ gnupg-1.0.5/mpi/powerpc32/mpih-mul3.S	Sun Apr 29 15:13:24 2001
@@ -1,7 +1,7 @@
 /* PowerPC-32 submul_1 -- Multiply a limb vector with a limb and subtract
  *			  the result from a second limb vector.
  *
- * Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1995, 1998 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/powerpc32/mpih-rshift.S gnupg-1.0.5/mpi/powerpc32/mpih-rshift.S
--- gnupg-1.0.4/mpi/powerpc32/mpih-rshift.S	Tue Dec  8 13:20:46 1998
+++ gnupg-1.0.5/mpi/powerpc32/mpih-rshift.S	Sun Apr 29 15:13:37 2001
@@ -1,6 +1,6 @@
 /* PowerPC-32 rshift
  *
- *	Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1995, 1998 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/powerpc32/mpih-sub1.S gnupg-1.0.5/mpi/powerpc32/mpih-sub1.S
--- gnupg-1.0.4/mpi/powerpc32/mpih-sub1.S	Tue Dec  8 13:20:46 1998
+++ gnupg-1.0.5/mpi/powerpc32/mpih-sub1.S	Sun Apr 29 15:13:54 2001
@@ -1,7 +1,7 @@
 /* PowerPC-32  sub_n -- Subtract two limb vectors of the same length > 0
  *			and store difference in a third limb vector.
  *
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/mpi/sparc32/mpih-add1.S gnupg-1.0.5/mpi/sparc32/mpih-add1.S
--- gnupg-1.0.4/mpi/sparc32/mpih-add1.S	Tue May 26 15:37:58 1998
+++ gnupg-1.0.5/mpi/sparc32/mpih-add1.S	Sun Apr 29 14:48:25 2001
@@ -1,16 +1,17 @@
 /* SPARC _add_n -- Add two limb vectors of the same length > 0 and store
  *		   sum in a third limb vector.
  *
- * Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1995, 1996, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/sparc32/mpih-lshift.S gnupg-1.0.5/mpi/sparc32/mpih-lshift.S
--- gnupg-1.0.4/mpi/sparc32/mpih-lshift.S	Tue May 26 15:37:58 1998
+++ gnupg-1.0.5/mpi/sparc32/mpih-lshift.S	Sun Apr 29 14:49:19 2001
@@ -1,15 +1,16 @@
 /* sparc lshift
  *
- * Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1995, 1996, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/sparc32/mpih-rshift.S gnupg-1.0.5/mpi/sparc32/mpih-rshift.S
--- gnupg-1.0.4/mpi/sparc32/mpih-rshift.S	Tue Jun  9 17:14:05 1998
+++ gnupg-1.0.5/mpi/sparc32/mpih-rshift.S	Sun Apr 29 14:48:55 2001
@@ -1,15 +1,16 @@
 /* sparc rshift
  *
- * Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1995, 1996, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * 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,
+ * 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.
diff -urN gnupg-1.0.4/mpi/sparc32/udiv.S gnupg-1.0.5/mpi/sparc32/udiv.S
--- gnupg-1.0.4/mpi/sparc32/udiv.S	Mon Jan 12 11:18:15 1998
+++ gnupg-1.0.5/mpi/sparc32/udiv.S	Sun Apr 29 14:49:57 2001
@@ -1,24 +1,33 @@
-! SPARC v7 __udiv_qrnnd division support, used from longlong.h.
-! This is for v7 CPUs without a floating-point unit.
-
-! Copyright (C) 1993, 1994, 1996 Free Software Foundation, Inc.
-
-! This file is part of the GNU MP Library.
-
-! The GNU MP Library is free software; you can redistribute it and/or modify
-! it under the terms of the GNU Library General Public License as published by
-! the Free Software Foundation; either version 2 of the License, or (at your
-! option) any later version.
-
-! The GNU MP Library 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 Library General Public
-! License for more details.
-
-! You should have received a copy of the GNU Library General Public License
-! along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-! the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-! MA 02111-1307, USA.
+/* SPARC v7 __udiv_qrnnd division support, used from longlong.h.
+ *           This is for v7 CPUs without a floating-point unit.
+ *
+ *      Copyright (C) 1993, 1994, 1996, 1998,
+ *                    2001 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
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
 
 ! INPUT PARAMETERS
diff -urN gnupg-1.0.4/mpi/sparc32v8/mpih-mul1.S gnupg-1.0.5/mpi/sparc32v8/mpih-mul1.S
--- gnupg-1.0.4/mpi/sparc32v8/mpih-mul1.S	Mon Jan 12 11:18:16 1998
+++ gnupg-1.0.5/mpi/sparc32v8/mpih-mul1.S	Sun Apr 29 14:50:47 2001
@@ -1,24 +1,34 @@
-! SPARC v8 __mpn_mul_1 -- Multiply a limb vector with a single limb and
-! store the product in a second limb vector.
+/* SPARC v8 __mpn_mul_1 -- Multiply a limb vector with a single limb and
+ *                         store the product in a second limb vector.
+ *
+ *      Copyright (C) 1992, 1994, 1995, 1998,
+ *                    2001 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
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
-! Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc.
-
-! This file is part of the GNU MP Library.
-
-! The GNU MP Library is free software; you can redistribute it and/or modify
-! it under the terms of the GNU Library General Public License as published by
-! the Free Software Foundation; either version 2 of the License, or (at your
-! option) any later version.
-
-! The GNU MP Library 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 Library General Public
-! License for more details.
-
-! You should have received a copy of the GNU Library General Public License
-! along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-! the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-! MA 02111-1307, USA.
 
 
 ! INPUT PARAMETERS
diff -urN gnupg-1.0.4/mpi/sparc32v8/mpih-mul2.S gnupg-1.0.5/mpi/sparc32v8/mpih-mul2.S
--- gnupg-1.0.4/mpi/sparc32v8/mpih-mul2.S	Mon Jan 12 11:18:17 1998
+++ gnupg-1.0.5/mpi/sparc32v8/mpih-mul2.S	Sun Apr 29 14:51:00 2001
@@ -1,24 +1,34 @@
-! SPARC v8 __mpn_addmul_1 -- Multiply a limb vector with a limb and
-! add the result to a second limb vector.
+/* SPARC v8 __mpn_addmul_1 -- Multiply a limb vector with a limb and
+ *                            add the result to a second limb vector.
+ *
+ *      Copyright (C) 1992, 1993, 1994, 1995, 1998, 
+ *                    2001 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
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
-! Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
-
-! This file is part of the GNU MP Library.
-
-! The GNU MP Library is free software; you can redistribute it and/or modify
-! it under the terms of the GNU Library General Public License as published by
-! the Free Software Foundation; either version 2 of the License, or (at your
-! option) any later version.
-
-! The GNU MP Library 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 Library General Public
-! License for more details.
-
-! You should have received a copy of the GNU Library General Public License
-! along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-! the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-! MA 02111-1307, USA.
 
 
 ! INPUT PARAMETERS
diff -urN gnupg-1.0.4/mpi/sparc32v8/mpih-mul3.S gnupg-1.0.5/mpi/sparc32v8/mpih-mul3.S
--- gnupg-1.0.4/mpi/sparc32v8/mpih-mul3.S	Mon Jan 12 11:18:17 1998
+++ gnupg-1.0.5/mpi/sparc32v8/mpih-mul3.S	Sun Apr 29 14:51:13 2001
@@ -1,26 +1,35 @@
-! SPARC v8 __mpn_submul_1 -- Multiply a limb vector with a limb and
-! subtract the result from a second limb vector.
-
-! Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
-
-! This file is part of the GNU MP Library.
-
-! The GNU MP Library is free software; you can redistribute it and/or modify
-! it under the terms of the GNU Library General Public License as published by
-! the Free Software Foundation; either version 2 of the License, or (at your
-! option) any later version.
-
-! The GNU MP Library 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 Library General Public
-! License for more details.
-
-! You should have received a copy of the GNU Library General Public License
-! along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-! the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-! MA 02111-1307, USA.
-
+/* SPARC v8 __mpn_submul_1 -- Multiply a limb vector with a limb and
+ *                            subtract the result from a second limb vector.
+ *
+ *      Copyright (C) 1992, 1993, 1994, 1998, 
+ *                    2001 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
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
+        
 ! INPUT PARAMETERS
 ! res_ptr	o0
 ! s1_ptr	o1
diff -urN gnupg-1.0.4/mpi/supersparc/udiv.S gnupg-1.0.5/mpi/supersparc/udiv.S
--- gnupg-1.0.4/mpi/supersparc/udiv.S	Mon Jan 12 11:18:17 1998
+++ gnupg-1.0.5/mpi/supersparc/udiv.S	Sun Apr 29 14:51:45 2001
@@ -1,25 +1,35 @@
-! SuperSPARC __udiv_qrnnd division support, used from longlong.h.
-! This is for SuperSPARC only, to compensate for its semi-functional
-! udiv instruction.
+/* SuperSPARC __udiv_qrnnd division support, used from longlong.h.
+ *            This is for SuperSPARC only, to compensate for its
+ *            semi-functional udiv instruction.
+ *
+ *      Copyright (C) 1993, 1994, 1996, 1998,
+ *                    2001 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
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
-! Copyright (C) 1993, 1994, 1996 Free Software Foundation, Inc.
-
-! This file is part of the GNU MP Library.
-
-! The GNU MP Library is free software; you can redistribute it and/or modify
-! it under the terms of the GNU Library General Public License as published by
-! the Free Software Foundation; either version 2 of the License, or (at your
-! option) any later version.
-
-! The GNU MP Library 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 Library General Public
-! License for more details.
-
-! You should have received a copy of the GNU Library General Public License
-! along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-! the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-! MA 02111-1307, USA.
 
 
 ! INPUT PARAMETERS
diff -urN gnupg-1.0.4/po/ChangeLog gnupg-1.0.5/po/ChangeLog
--- gnupg-1.0.4/po/ChangeLog	Mon Oct 16 18:38:49 2000
+++ gnupg-1.0.5/po/ChangeLog	Fri Apr 27 14:32:29 2001
@@ -1,3 +1,65 @@
+2001-04-27  Werner Koch  <wk@gnupg.org>
+
+	* de.po: Removed an extra "%s".
+
+2001-04-25  Werner Koch  <wk@gnupg.org>
+
+	* fr.po: Updated.
+
+2001-04-23  Werner Koch  <wk@gnupg.org>
+
+	* eo.po: Updated.
+
+	* it.po: Updated.
+
+2001-04-22  Werner Koch  <wk@gnupg.org>
+
+	* pl.po: Updated.
+
+2001-04-17  Werner Koch  <wk@gnupg.org>
+
+	* et.po: New.
+
+	* de.po: Updated.
+
+2001-04-16  Werner Koch  <wk@gnupg.org>
+
+	* pt_PT.po: Updated.
+
+2001-04-06  Werner Koch  <wk@gnupg.org>
+
+	* tr.po: New. 
+
+2001-03-18  Werner Koch  <wk@gnupg.org>
+
+	* de.po, de.glo: Updated. 
+
+2001-02-22  Werner Koch  <wk@gnupg.org>
+
+	* de.po, de.glo: Updated.
+
+2001-01-23  Werner Koch  <wk@gnupg.org>
+
+	* de.po: Removed superfluous \r.
+
+2001-01-14  Werner Koch  <wk@gnupg.org>
+
+	* de.po, de.glo: Updated.
+
+2000-12-19  Werner Koch  <wk@gnupg.org>
+
+	* pl.po: Updated.
+
+	* ja.po: Justified one message.
+
+2000-10-23  Werner Koch  <wk@gnupg.org>
+
+	* ja.po: Updated.
+
+2000-10-19  Werner Koch  <wk@gnupg.org>
+
+	Fixed a typo in all files.
+
 2000-10-16  Werner Koch  <wk@gnupg.org>
 
 	* de.po, de.glo: Updated.
@@ -15,7 +77,7 @@
 
   Small English spelling correction in all files.
 
-Wed Jul  5 13:28:45 CEST 2000  Werner Koch  <wk@>
+Wed Jul  5 13:28:45 CEST 2000  Werner Koch  <wk@openit.de>
 
   * fr.po: Minor changes by Gael
 
@@ -286,5 +348,17 @@
 Fri Mar 13 09:43:19 1998  Werner Koch  (wk@isil.d.shuttle.de)
 
 	* it.po: New
+
+
+
+ Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 
diff -urN gnupg-1.0.4/po/cat-id-tbl.c gnupg-1.0.5/po/cat-id-tbl.c
--- gnupg-1.0.4/po/cat-id-tbl.c	Thu Sep 14 13:26:57 2000
+++ gnupg-1.0.5/po/cat-id-tbl.c	Sat Apr 28 19:58:18 2001
@@ -66,109 +66,112 @@
   {"network error", 57},
   {"not encrypted", 58},
   {"not processed", 59},
-  {"... this is a bug (%s:%d:%s)\n", 60},
-  {"you found a bug ... (%s:%d)\n", 61},
-  {"can't open `%s': %s\n", 62},
-  {"can't stat `%s': %s\n", 63},
-  {"`%s' is not a regular file - ignored\n", 64},
-  {"note: random_seed file is empty\n", 65},
-  {"warning: invalid size of random_seed file - not used\n", 66},
-  {"can't read `%s': %s\n", 67},
-  {"note: random_seed file not updated\n", 68},
-  {"can't create `%s': %s\n", 69},
-  {"can't write `%s': %s\n", 70},
-  {"can't close `%s': %s\n", 71},
-  {"too many random bits requested; the limit is %d\n", 72},
-  {"WARNING: using insecure random number generator!!\n", 73},
+  {"unusable public key", 60},
+  {"unusable secret key", 61},
+  {"... this is a bug (%s:%d:%s)\n", 62},
+  {"you found a bug ... (%s:%d)\n", 63},
+  {"can't open `%s': %s\n", 64},
+  {"can't stat `%s': %s\n", 65},
+  {"`%s' is not a regular file - ignored\n", 66},
+  {"note: random_seed file is empty\n", 67},
+  {"warning: invalid size of random_seed file - not used\n", 68},
+  {"can't read `%s': %s\n", 69},
+  {"note: random_seed file not updated\n", 70},
+  {"can't create `%s': %s\n", 71},
+  {"can't write `%s': %s\n", 72},
+  {"can't close `%s': %s\n", 73},
+  {"too many random bits requested; the limit is %d\n", 74},
+  {"WARNING: using insecure random number generator!!\n", 75},
   {"\
 The random number generator is only a kludge to let\n\
 it run - it is in no way a strong RNG!\n\
 \n\
 DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n\
-\n", 74},
+\n", 76},
   {"\
 \n\
 Not enough random bytes available.  Please do some other work to give\n\
-the OS a chance to collect more entropy! (Need %d more bytes)\n", 75},
+the OS a chance to collect more entropy! (Need %d more bytes)\n", 77},
   {"\
 @Commands:\n\
- ", 76},
-  {"|[file]|make a signature", 77},
-  {"|[file]|make a clear text signature", 78},
-  {"make a detached signature", 79},
-  {"encrypt data", 80},
-  {"encryption only with symmetric cipher", 81},
-  {"store only", 82},
-  {"decrypt data (default)", 83},
-  {"verify a signature", 84},
-  {"list keys", 85},
-  {"list keys and signatures", 86},
-  {"check key signatures", 87},
-  {"list keys and fingerprints", 88},
-  {"list secret keys", 89},
-  {"generate a new key pair", 90},
-  {"remove key from the public keyring", 91},
-  {"remove key from the secret keyring", 92},
-  {"sign a key", 93},
-  {"sign a key locally", 94},
-  {"sign or edit a key", 95},
-  {"generate a revocation certificate", 96},
-  {"export keys", 97},
-  {"export keys to a key server", 98},
-  {"import keys from a key server", 99},
-  {"import/merge keys", 100},
-  {"list only the sequence of packets", 101},
-  {"export the ownertrust values", 102},
-  {"import ownertrust values", 103},
-  {"update the trust database", 104},
-  {"|[NAMES]|check the trust database", 105},
-  {"fix a corrupted trust database", 106},
-  {"De-Armor a file or stdin", 107},
-  {"En-Armor a file or stdin", 108},
-  {"|algo [files]|print message digests", 109},
+ ", 78},
+  {"|[file]|make a signature", 79},
+  {"|[file]|make a clear text signature", 80},
+  {"make a detached signature", 81},
+  {"encrypt data", 82},
+  {"encryption only with symmetric cipher", 83},
+  {"store only", 84},
+  {"decrypt data (default)", 85},
+  {"verify a signature", 86},
+  {"list keys", 87},
+  {"list keys and signatures", 88},
+  {"check key signatures", 89},
+  {"list keys and fingerprints", 90},
+  {"list secret keys", 91},
+  {"generate a new key pair", 92},
+  {"remove key from the public keyring", 93},
+  {"remove key from the secret keyring", 94},
+  {"sign a key", 95},
+  {"sign a key locally", 96},
+  {"sign or edit a key", 97},
+  {"generate a revocation certificate", 98},
+  {"export keys", 99},
+  {"export keys to a key server", 100},
+  {"import keys from a key server", 101},
+  {"import/merge keys", 102},
+  {"list only the sequence of packets", 103},
+  {"export the ownertrust values", 104},
+  {"import ownertrust values", 105},
+  {"update the trust database", 106},
+  {"|[NAMES]|check the trust database", 107},
+  {"fix a corrupted trust database", 108},
+  {"De-Armor a file or stdin", 109},
+  {"En-Armor a file or stdin", 110},
+  {"|algo [files]|print message digests", 111},
   {"\
 @\n\
 Options:\n\
- ", 110},
-  {"create ascii armored output", 111},
-  {"|NAME|encrypt for NAME", 112},
-  {"|NAME|use NAME as default recipient", 113},
-  {"use the default key as default recipient", 114},
-  {"use this user-id to sign or decrypt", 115},
-  {"|N|set compress level N (0 disables)", 116},
-  {"use canonical text mode", 117},
-  {"use as output file", 118},
-  {"verbose", 119},
-  {"be somewhat more quiet", 120},
-  {"don't use the terminal at all", 121},
-  {"force v3 signatures", 122},
-  {"always use a MDC for encryption", 123},
-  {"do not make any changes", 124},
-  {"batch mode: never ask", 125},
-  {"assume yes on most questions", 126},
-  {"assume no on most questions", 127},
-  {"add this keyring to the list of keyrings", 128},
-  {"add this secret keyring to the list", 129},
-  {"|NAME|use NAME as default secret key", 130},
-  {"|HOST|use this keyserver to lookup keys", 131},
-  {"|NAME|set terminal charset to NAME", 132},
-  {"read options from file", 133},
-  {"|FD|write status info to this FD", 134},
-  {"|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},
+ ", 112},
+  {"create ascii armored output", 113},
+  {"|NAME|encrypt for NAME", 114},
+  {"|NAME|use NAME as default recipient", 115},
+  {"use the default key as default recipient", 116},
+  {"use this user-id to sign or decrypt", 117},
+  {"|N|set compress level N (0 disables)", 118},
+  {"use canonical text mode", 119},
+  {"use as output file", 120},
+  {"verbose", 121},
+  {"be somewhat more quiet", 122},
+  {"don't use the terminal at all", 123},
+  {"force v3 signatures", 124},
+  {"always use a MDC for encryption", 125},
+  {"do not make any changes", 126},
+  {"use the gpg-agent", 127},
+  {"batch mode: never ask", 128},
+  {"assume yes on most questions", 129},
+  {"assume no on most questions", 130},
+  {"add this keyring to the list of keyrings", 131},
+  {"add this secret keyring to the list", 132},
+  {"|NAME|use NAME as default secret key", 133},
+  {"|HOST|use this keyserver to lookup keys", 134},
+  {"|NAME|set terminal charset to NAME", 135},
+  {"read options from file", 136},
+  {"|FD|write status info to this FD", 137},
+  {"|KEYID|ulimately trust this key", 138},
+  {"|FILE|load extension module FILE", 139},
+  {"emulate the mode described in RFC1991", 140},
+  {"set all packet, cipher and digest options to OpenPGP behavior", 141},
+  {"|N|use passphrase mode N", 142},
+  {"|NAME|use message digest algorithm NAME for passphrases", 143},
+  {"|NAME|use cipher algorithm NAME for passphrases", 144},
+  {"|NAME|use cipher algorithm NAME", 145},
+  {"|NAME|use message digest algorithm NAME", 146},
+  {"|N|use compress algorithm N", 147},
+  {"throw keyid field of encrypted packets", 148},
+  {"|NAME=VALUE|use this notation data", 149},
   {"\
 @\n\
-(See the man page for a complete listing of all commands and options)\n", 147},
+(See the man page for a complete listing of all commands and options)\n", 150},
   {"\
 @\n\
 Examples:\n\
@@ -177,95 +180,96 @@
  --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", 148},
-  {"Please report bugs to <gnupg-bugs@gnu.org>.\n", 149},
-  {"Usage: gpg [options] [files] (-h for help)", 150},
+ --fingerprint [names]      show fingerprints\n", 151},
+  {"Please report bugs to <gnupg-bugs@gnu.org>.\n", 152},
+  {"Usage: gpg [options] [files] (-h for help)", 153},
   {"\
 Syntax: gpg [options] [files]\n\
 sign, check, encrypt or decrypt\n\
-default operation depends on the input data\n", 151},
+default operation depends on the input data\n", 154},
   {"\
 \n\
-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},
+Supported algorithms:\n", 155},
+  {"usage: gpg [options] ", 156},
+  {"conflicting commands\n", 157},
+  {"NOTE: no default option file `%s'\n", 158},
+  {"option file `%s': %s\n", 159},
+  {"reading options from `%s'\n", 160},
+  {"%s is not a valid character set\n", 161},
+  {"WARNING: program may create a core file!\n", 162},
+  {"NOTE: %s is not for normal use!\n", 163},
+  {"%s not allowed with %s!\n", 164},
+  {"%s makes no sense with %s!\n", 165},
+  {"selected cipher algorithm is invalid\n", 166},
+  {"selected digest algorithm is invalid\n", 167},
+  {"the given policy URL is invalid\n", 168},
+  {"compress algorithm must be in range %d..%d\n", 169},
+  {"completes-needed must be greater than 0\n", 170},
+  {"marginals-needed must be greater than 1\n", 171},
+  {"max-cert-depth must be in range 1 to 255\n", 172},
+  {"NOTE: simple S2K mode (0) is strongly discouraged\n", 173},
+  {"invalid S2K mode; must be 0, 1 or 3\n", 174},
+  {"failed to initialize the TrustDB: %s\n", 175},
+  {"--store [filename]", 176},
+  {"--symmetric [filename]", 177},
+  {"--encrypt [filename]", 178},
+  {"--sign [filename]", 179},
+  {"--sign --encrypt [filename]", 180},
+  {"--clearsign [filename]", 181},
+  {"--decrypt [filename]", 182},
+  {"--sign-key user-id", 183},
+  {"--lsign-key user-id", 184},
+  {"--edit-key user-id [commands]", 185},
+  {"--delete-secret-key user-id", 186},
+  {"--delete-key user-id", 187},
+  {"--delete-secret-and-public-key user-id", 188},
+  {"can't open %s: %s\n", 189},
+  {"-k[v][v][v][c] [user-id] [keyring]", 190},
+  {"dearmoring failed: %s\n", 191},
+  {"enarmoring failed: %s\n", 192},
+  {"invalid hash algorithm `%s'\n", 193},
+  {"[filename]", 194},
+  {"Go ahead and type your message ...\n", 195},
+  {"can't open `%s'\n", 196},
   {"\
-the first character of a notation name must be a letter or an underscore\n", 193},
+the first character of a notation name must be a letter or an underscore\n", 197},
   {"\
 a notation name must have only letters, digits, dots or underscores and end \
-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},
+with an '='\n", 198},
+  {"dots in a notation name must be surrounded by other characters\n", 199},
+  {"a notation value must not use any control characters\n", 200},
+  {"armor: %s\n", 201},
+  {"invalid armor header: ", 202},
+  {"armor header: ", 203},
+  {"invalid clearsig header\n", 204},
+  {"nested clear text signatures\n", 205},
+  {"invalid dash escaped line: ", 206},
+  {"unexpected armor:", 207},
+  {"invalid radix64 character %02x skipped\n", 208},
+  {"premature eof (no CRC)\n", 209},
+  {"premature eof (in CRC)\n", 210},
+  {"malformed CRC\n", 211},
+  {"CRC error; %06lx - %06lx\n", 212},
+  {"premature eof (in Trailer)\n", 213},
+  {"error in trailer line\n", 214},
+  {"For info see http://www.gnupg.org", 215},
+  {"no valid OpenPGP data found.\n", 216},
+  {"invalid armor: line longer than %d characters\n", 217},
+  {"\
+quoted printable character in armor - probably a buggy MTA has been used\n", 218},
+  {"             Fingerprint:", 219},
+  {"Fingerprint:", 220},
+  {"No reason specified", 221},
+  {"Key is superseded", 222},
+  {"Key has been compromised", 223},
+  {"Key is no longer used", 224},
+  {"User ID is no longer valid", 225},
+  {"Reason for revocation: ", 226},
+  {"Revocation comment: ", 227},
+  {"sSmMqQ", 228},
   {"\
 No trust value assigned to %lu:\n\
-%4u%c/%08lX %s \"", 225},
+%4u%c/%08lX %s \"", 229},
   {"\
 Please decide how far you trust this user to correctly\n\
 verify other users' keys (by looking at passports,\n\
@@ -275,589 +279,605 @@
  2 = I do NOT trust\n\
  3 = I trust marginally\n\
  4 = I trust fully\n\
- 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},
+ s = please show me more information\n", 230},
+  {" m = back to the main menu\n", 231},
+  {" q = quit\n", 232},
+  {"Your decision? ", 233},
+  {"Certificates leading to an ultimately trusted key:\n", 234},
   {"\
 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", 231},
+\n", 235},
   {"\
 No path leading to one of our keys found.\n\
-\n", 232},
+\n", 236},
   {"\
 No certificates with undefined trust found.\n\
-\n", 233},
+\n", 237},
   {"\
 No trust values changed.\n\
-\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},
+\n", 238},
+  {"key %08lX: key has been revoked!\n", 239},
+  {"Use this key anyway? ", 240},
+  {"key %08lX: subkey has been revoked!\n", 241},
+  {"%08lX: key has expired\n", 242},
+  {"%08lX: no info to calculate a trust probability\n", 243},
+  {"%08lX: We do NOT trust this key\n", 244},
   {"\
 %08lX: It is not sure that this key really belongs to the owner\n\
-but it is accepted anyway\n", 241},
-  {"This key probably belongs to the owner\n", 242},
-  {"This key belongs to us\n", 243},
+but it is accepted anyway\n", 245},
+  {"This key probably belongs to the owner\n", 246},
+  {"This key belongs to us\n", 247},
   {"\
 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", 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},
+\n", 248},
+  {"WARNING: Using untrusted key!\n", 249},
+  {"WARNING: This key has been revoked by its owner!\n", 250},
+  {"         This could mean that the signature is forgery.\n", 251},
+  {"WARNING: This subkey has been revoked by its owner!\n", 252},
+  {"Note: This key has expired!\n", 253},
+  {"WARNING: This key is not certified with a trusted signature!\n", 254},
+  {"\
+         There is no indication that the signature belongs to the owner.\n", 255},
+  {"WARNING: We do NOT trust this key!\n", 256},
+  {"         The signature is probably a FORGERY.\n", 257},
+  {"\
+WARNING: This key is not certified with sufficiently trusted signatures!\n", 258},
+  {"         It is not certain that the signature belongs to the owner.\n", 259},
+  {"%s: skipped: %s\n", 260},
+  {"%s: skipped: public key already present\n", 261},
   {"\
 You did not specify a user ID. (you may use \"-r\")\n\
-\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},
+\n", 262},
+  {"Enter the user ID: ", 263},
+  {"No such user ID.\n", 264},
+  {"skipped: public key already set as default recipient\n", 265},
+  {"Public key is disabled.\n", 266},
+  {"skipped: public key already set with --encrypt-to\n", 267},
+  {"unknown default recipient `%s'\n", 268},
+  {"%s: error checking key: %s\n", 269},
+  {"%s: skipped: public key is disabled\n", 270},
+  {"no valid addressees\n", 271},
+  {"writing self signature\n", 272},
+  {"writing key binding signature\n", 273},
+  {"keysize invalid; using %u bits\n", 274},
+  {"keysize rounded up to %u bits\n", 275},
+  {"Please select what kind of key you want:\n", 276},
+  {"   (%d) DSA and ElGamal (default)\n", 277},
+  {"   (%d) DSA (sign only)\n", 278},
+  {"   (%d) ElGamal (encrypt only)\n", 279},
+  {"   (%d) ElGamal (sign and encrypt)\n", 280},
+  {"   (%d) RSA (sign and encrypt)\n", 281},
+  {"Your selection? ", 282},
+  {"Do you really want to create a sign and encrypt key? ", 283},
+  {"The use of this algorithm is deprecated - create anyway? ", 284},
+  {"Invalid selection.\n", 285},
   {"\
 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", 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},
+    highest suggested keysize is 2048 bits\n", 286},
+  {"What keysize do you want? (1024) ", 287},
+  {"DSA only allows keysizes from 512 to 1024\n", 288},
+  {"keysize too small; 768 is smallest value allowed.\n", 289},
+  {"keysize too small; 1024 is smallest value allowed for RSA.\n", 290},
+  {"keysize too large; %d is largest value allowed.\n", 291},
   {"\
 Keysizes larger than 2048 are not suggested because\n\
-computations take REALLY long!\n", 287},
-  {"Are you sure that you want this keysize? ", 288},
+computations take REALLY long!\n", 292},
+  {"Are you sure that you want this keysize? ", 293},
   {"\
 Okay, but keep in mind that your monitor and keyboard radiation is also very \
-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},
+vulnerable to attacks!\n", 294},
+  {"Do you really need such a large keysize? ", 295},
+  {"Requested keysize is %u bits\n", 296},
+  {"rounded up to %u bits\n", 297},
   {"\
 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", 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},
+      <n>y = key expires in n years\n", 298},
+  {"Key is valid for? (0) ", 299},
+  {"invalid value\n", 300},
+  {"Key does not expire at all\n", 301},
+  {"Key expires at %s\n", 302},
   {"\
 Your system can't display dates beyond 2038.\n\
-However, it will be correctly handled up to 2106.\n", 298},
-  {"Is this correct (y/n)? ", 299},
+However, it will be correctly handled up to 2106.\n", 303},
+  {"Is this correct (y/n)? ", 304},
   {"\
 \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", 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},
+\n", 305},
+  {"Real name: ", 306},
+  {"Invalid character in name\n", 307},
+  {"Name may not start with a digit\n", 308},
+  {"Name must be at least 5 characters long\n", 309},
+  {"Email address: ", 310},
+  {"Not a valid email address\n", 311},
+  {"Comment: ", 312},
+  {"Invalid character in comment\n", 313},
+  {"You are using the `%s' character set.\n", 314},
   {"\
 You selected this USER-ID:\n\
     \"%s\"\n\
-\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},
+\n", 315},
+  {"Please don't put the email address into the real name or the comment\n", 316},
+  {"NnCcEeOoQq", 317},
+  {"Change (N)ame, (C)omment, (E)mail or (Q)uit? ", 318},
+  {"Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? ", 319},
+  {"Please correct the error first\n", 320},
   {"\
 You need a Passphrase to protect your secret key.\n\
-\n", 316},
-  {"passphrase not correctly repeated; try again.\n", 317},
+\n", 321},
+  {"passphrase not correctly repeated; try again.\n", 322},
   {"\
 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", 318},
+\n", 323},
   {"\
 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", 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},
+generator a better chance to gain enough entropy.\n", 324},
+  {"DSA keypair will have 1024 bits.\n", 325},
+  {"Key generation canceled.\n", 326},
+  {"writing public key to `%s'\n", 327},
+  {"writing secret key to `%s'\n", 328},
+  {"public and secret key created and signed.\n", 329},
   {"\
 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", 325},
-  {"Key generation failed: %s\n", 326},
+the command \"--edit-key\" to generate a secondary key for this purpose.\n", 330},
+  {"Key generation failed: %s\n", 331},
   {"\
-key has been created %lu second in future (time warp or clock problem)\n", 327},
+key has been created %lu second in future (time warp or clock problem)\n", 332},
   {"\
-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},
+key has been created %lu seconds in future (time warp or clock problem)\n", 333},
+  {"Really create? ", 334},
+  {"%s: can't open: %s\n", 335},
+  {"error creating passphrase: %s\n", 336},
+  {"%s: WARNING: empty file\n", 337},
+  {"reading from `%s'\n", 338},
+  {"%s/%s encrypted for: %s\n", 339},
+  {"%s: user not found: %s\n", 340},
+  {"certificate read problem: %s\n", 341},
+  {"key %08lX: not a rfc2440 key - skipped\n", 342},
+  {"key %08lX: not protected - skipped\n", 343},
+  {"WARNING: nothing exported\n", 344},
+  {"too many entries in pk cache - disabled\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},
+  {"too many entries in unk cache - disabled\n", 347},
+  {"using secondary key %08lX instead of primary key %08lX\n", 348},
+  {"key %08lX: secret key without public key - skipped\n", 349},
+  {"skipping block of type %d\n", 350},
+  {"%lu keys so far processed\n", 351},
+  {"error reading `%s': %s\n", 352},
+  {"Total number processed: %lu\n", 353},
+  {"      skipped new keys: %lu\n", 354},
+  {"          w/o user IDs: %lu\n", 355},
+  {"              imported: %lu", 356},
+  {"             unchanged: %lu\n", 357},
+  {"          new user IDs: %lu\n", 358},
+  {"           new subkeys: %lu\n", 359},
+  {"        new signatures: %lu\n", 360},
+  {"   new key revocations: %lu\n", 361},
+  {"      secret keys read: %lu\n", 362},
+  {"  secret keys imported: %lu\n", 363},
+  {" secret keys unchanged: %lu\n", 364},
+  {"key %08lX: no user ID\n", 365},
+  {"key %08lX: no valid user IDs\n", 366},
+  {"this may be caused by a missing self-signature\n", 367},
+  {"key %08lX: public key not found: %s\n", 368},
+  {"key %08lX: new key - skipped\n", 369},
+  {"no default public keyring\n", 370},
+  {"writing to `%s'\n", 371},
+  {"can't lock keyring `%s': %s\n", 372},
+  {"error writing keyring `%s': %s\n", 373},
+  {"key %08lX: public key imported\n", 374},
+  {"key %08lX: doesn't match our copy\n", 375},
+  {"key %08lX: can't locate original keyblock: %s\n", 376},
+  {"key %08lX: can't read original keyblock: %s\n", 377},
+  {"key %08lX: 1 new user ID\n", 378},
+  {"key %08lX: %d new user IDs\n", 379},
+  {"key %08lX: 1 new signature\n", 380},
+  {"key %08lX: %d new signatures\n", 381},
+  {"key %08lX: 1 new subkey\n", 382},
+  {"key %08lX: %d new subkeys\n", 383},
+  {"key %08lX: not changed\n", 384},
+  {"secret key %08lX not imported (use %s to allow for it)\n", 385},
+  {"key %08lX: secret key imported\n", 386},
+  {"key %08lX: already in secret keyring\n", 387},
+  {"key %08lX: secret key not found: %s\n", 388},
+  {"key %08lX: no public key - can't apply revocation certificate\n", 389},
+  {"key %08lX: invalid revocation certificate: %s - rejected\n", 390},
+  {"key %08lX: revocation certificate imported\n", 391},
+  {"key %08lX: no user ID for signature\n", 392},
+  {"key %08lX: unsupported public key algorithm\n", 393},
+  {"key %08lX: invalid self-signature\n", 394},
+  {"key %08lX: no subkey for key binding\n", 395},
+  {"key %08lX: invalid subkey binding\n", 396},
+  {"key %08lX: accepted non self-signed user ID '", 397},
+  {"key %08lX: skipped user ID '", 398},
+  {"key %08lX: skipped subkey\n", 399},
+  {"key %08lX: non exportable signature (class %02x) - skipped\n", 400},
+  {"key %08lX: revocation certificate at wrong place - skipped\n", 401},
+  {"key %08lX: invalid revocation certificate: %s - skipped\n", 402},
+  {"key %08lX: duplicated user ID detected - merged\n", 403},
+  {"key %08lX: revocation certificate added\n", 404},
+  {"key %08lX: our copy has no self-signature\n", 405},
+  {"%s: user not found\n", 406},
+  {"[revocation]", 407},
+  {"[self-signature]", 408},
+  {"1 bad signature\n", 409},
+  {"%d bad signatures\n", 410},
+  {"1 signature not checked due to a missing key\n", 411},
+  {"%d signatures not checked due to missing keys\n", 412},
+  {"1 signature not checked due to an error\n", 413},
+  {"%d signatures not checked due to errors\n", 414},
+  {"1 user ID without valid self-signature detected\n", 415},
+  {"%d user IDs without valid self-signatures detected\n", 416},
+  {"Already signed by key %08lX\n", 417},
+  {"Nothing to sign with key %08lX\n", 418},
   {"\
 Are you really sure that you want to sign this key\n\
-with your key: \"", 415},
+with your key: \"", 419},
   {"\
 The signature will be marked as non-exportable.\n\
-\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},
+\n", 420},
+  {"Really sign? ", 421},
+  {"signing failed: %s\n", 422},
+  {"This key is not protected.\n", 423},
+  {"Secret parts of primary key are not available.\n", 424},
+  {"Key is protected.\n", 425},
+  {"Can't edit this key: %s\n", 426},
   {"\
 Enter the new passphrase for this secret key.\n\
-\n", 423},
+\n", 427},
   {"\
 You don't want a passphrase - this is probably a *bad* idea!\n\
-\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", 428},
+  {"Do you really want to do this? ", 429},
+  {"moving a key signature to the correct place\n", 430},
+  {"quit this menu", 431},
+  {"q", 432},
+  {"save", 433},
+  {"save and quit", 434},
+  {"help", 435},
+  {"show this help", 436},
+  {"fpr", 437},
+  {"show fingerprint", 438},
+  {"list", 439},
+  {"list key and user IDs", 440},
+  {"l", 441},
+  {"uid", 442},
+  {"select user ID N", 443},
+  {"key", 444},
+  {"select secondary key N", 445},
+  {"check", 446},
+  {"list signatures", 447},
+  {"c", 448},
+  {"sign", 449},
+  {"sign the key", 450},
+  {"s", 451},
+  {"lsign", 452},
+  {"sign the key locally", 453},
+  {"debug", 454},
+  {"adduid", 455},
+  {"add a user ID", 456},
+  {"deluid", 457},
+  {"delete user ID", 458},
+  {"addkey", 459},
+  {"add a secondary key", 460},
+  {"delkey", 461},
+  {"delete a secondary key", 462},
+  {"delsig", 463},
+  {"delete signatures", 464},
+  {"expire", 465},
+  {"change the expire date", 466},
+  {"toggle", 467},
+  {"toggle between secret and public key listing", 468},
+  {"t", 469},
+  {"pref", 470},
+  {"list preferences", 471},
+  {"showpref", 472},
+  {"passwd", 473},
+  {"change the passphrase", 474},
+  {"trust", 475},
+  {"change the ownertrust", 476},
+  {"revsig", 477},
+  {"revoke signatures", 478},
+  {"revkey", 479},
+  {"revoke a secondary key", 480},
+  {"disable", 481},
+  {"disable a key", 482},
+  {"enable", 483},
+  {"enable a key", 484},
+  {"can't do that in batchmode\n", 485},
+  {"Secret key is available.\n", 486},
+  {"Command> ", 487},
+  {"Need the secret key to do this.\n", 488},
+  {"Please use the command \"toggle\" first.\n", 489},
+  {"Really sign all user IDs? ", 490},
+  {"Hint: Select the user IDs to sign\n", 491},
+  {"update of trustdb failed: %s\n", 492},
+  {"You must select at least one user ID.\n", 493},
+  {"You can't delete the last user ID!\n", 494},
+  {"Really remove all selected user IDs? ", 495},
+  {"Really remove this user ID? ", 496},
+  {"You must select at least one key.\n", 497},
+  {"Do you really want to delete the selected keys? ", 498},
+  {"Do you really want to delete this key? ", 499},
+  {"Do you really want to revoke the selected keys? ", 500},
+  {"Do you really want to revoke this key? ", 501},
+  {"Save changes? ", 502},
+  {"Quit without saving? ", 503},
+  {"update failed: %s\n", 504},
+  {"update secret failed: %s\n", 505},
+  {"Key not changed so no update needed.\n", 506},
+  {"Invalid command  (try \"help\")\n", 507},
+  {"%s%c %4u%c/%08lX  created: %s expires: %s", 508},
+  {" trust: %c/%c", 509},
+  {"This key has been disabled", 510},
+  {"rev! subkey has been revoked: %s\n", 511},
+  {"rev- faked revocation found\n", 512},
+  {"rev? problem checking revocation: %s\n", 513},
+  {"Delete this good signature? (y/N/q)", 514},
+  {"Delete this invalid signature? (y/N/q)", 515},
+  {"Delete this unknown signature? (y/N/q)", 516},
+  {"Really delete this self-signature? (y/N)", 517},
+  {"Deleted %d signature.\n", 518},
+  {"Deleted %d signatures.\n", 519},
+  {"Nothing deleted.\n", 520},
+  {"Please remove selections from the secret keys.\n", 521},
+  {"Please select at most one secondary key.\n", 522},
+  {"Changing expiration time for a secondary key.\n", 523},
+  {"Changing expiration time for the primary key.\n", 524},
+  {"You can't change the expiration date of a v3 key\n", 525},
+  {"No corresponding signature in secret ring\n", 526},
+  {"No user ID with index %d\n", 527},
+  {"No secondary key with index %d\n", 528},
+  {"user ID: \"", 529},
   {"\
 \"\n\
-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},
+signed with your key %08lX at %s\n", 530},
+  {"Create a revocation certificate for this signature? (y/N)", 531},
+  {"You have signed these user IDs:\n", 532},
+  {"   signed by %08lX at %s\n", 533},
+  {"   revoked by %08lX at %s\n", 534},
+  {"You are about to revoke these signatures:\n", 535},
+  {"Really create the revocation certificates? (y/N)", 536},
+  {"no secret key\n", 537},
+  {" [expires: %s]", 538},
+  {"public key is %08lX\n", 539},
+  {"public key encrypted data: good DEK\n", 540},
+  {"encrypted with %u-bit %s key, ID %08lX, created %s\n", 541},
+  {"encrypted with %s key, ID %08lX\n", 542},
+  {"public key decryption failed: %s\n", 543},
+  {"decryption okay\n", 544},
+  {"WARNING: encrypted message has been manipulated!\n", 545},
+  {"decryption failed: %s\n", 546},
+  {"NOTE: sender requested \"for-your-eyes-only\"\n", 547},
+  {"original file name='%.*s'\n", 548},
+  {"standalone revocation - use \"gpg --import\" to apply\n", 549},
+  {"WARNING: invalid notation data found\n", 550},
+  {"Notation: ", 551},
+  {"Policy: ", 552},
+  {"signature verification suppressed\n", 553},
+  {"can't handle these multiple signatures\n", 554},
+  {"Signature made %.*s using %s key ID %08lX\n", 555},
+  {"BAD signature from \"", 556},
+  {"Good signature from \"", 557},
+  {"                aka \"", 558},
+  {"Can't check signature: %s\n", 559},
+  {"not a detached signature\n", 560},
+  {"standalone signature of class 0x%02x\n", 561},
+  {"old style (PGP 2.x) signature\n", 562},
+  {"invalid root packet detected in proc_tree()\n", 563},
+  {"can't disable core dumps: %s\n", 564},
+  {"Experimental algorithms should not be used!\n", 565},
+  {"this cipher algorithm is deprecated; please use a more standard one!\n", 566},
+  {"can't handle public key algorithm %d\n", 567},
+  {"subpacket of type %d has critical bit set\n", 568},
+  {"gpg-agent is not available in this session\n", 569},
+  {"malformed GPG_AGENT_INFO environment variable\n", 570},
+  {"can't connect to `%s': %s\n", 571},
+  {" (main key ID %08lX)", 572},
+  {"\
+You need a passphrase to unlock the secret key for user:\n\
+\"%.*s\"\n\
+%u-bit %s key, ID %08lX, created %s%s\n", 573},
+  {"Enter passphrase\n", 574},
+  {"Repeat passphrase\n", 575},
+  {"passphrase too long\n", 576},
+  {"invalid response from agent\n", 577},
+  {"cancelled by user\n", 578},
+  {"problem with the agent: agent returns 0x%lx\n", 579},
   {"\
 \n\
 You need a passphrase to unlock the secret key for\n\
-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},
+user: \"", 580},
+  {"%u-bit %s key, ID %08lX, created %s", 581},
+  {"can't query password in batchmode\n", 582},
+  {"Enter passphrase: ", 583},
+  {"Repeat passphrase: ", 584},
+  {"data not saved; use option \"--output\" to save it\n", 585},
+  {"Detached signature.\n", 586},
+  {"Please enter name of data file: ", 587},
+  {"reading stdin ...\n", 588},
+  {"no signed data\n", 589},
+  {"can't open signed data `%s'\n", 590},
+  {"anonymous receiver; trying secret key %08lX ...\n", 591},
+  {"okay, we are the anonymous recipient.\n", 592},
+  {"old encoding of the DEK is not supported\n", 593},
+  {"cipher algorithm %d is unknown or disabled\n", 594},
+  {"NOTE: cipher algorithm %d not found in preferences\n", 595},
+  {"NOTE: secret key %08lX expired at %s\n", 596},
+  {"requesting key %08lX from %s ...\n", 597},
+  {"can't get key from keyserver: %s\n", 598},
+  {"no keyserver known (use option --keyserver)\n", 599},
+  {"%s: not a valid key ID\n", 600},
+  {"error sending to `%s': %s\n", 601},
+  {"success sending to `%s' (status=%u)\n", 602},
+  {"failed sending to `%s': status=%u\n", 603},
+  {"secret key parts are not available\n", 604},
+  {"protection algorithm %d is not supported\n", 605},
+  {"Invalid passphrase; please try again ...\n", 606},
+  {"WARNING: Weak key detected - please change passphrase again.\n", 607},
+  {"assuming bad MDC due to an unknown critical bit\n", 608},
+  {"\
+this is a PGP generated ElGamal key which is NOT secure for signatures!\n", 609},
+  {"public key is %lu second newer than the signature\n", 610},
+  {"public key is %lu seconds newer than the signature\n", 611},
+  {"NOTE: signature key %08lX expired %s\n", 612},
+  {"assuming bad signature due to an unknown critical bit\n", 613},
+  {"checking created signature failed: %s\n", 614},
+  {"%s signature from: %s\n", 615},
+  {"can't create %s: %s\n", 616},
+  {"signing:", 617},
+  {"WARNING: `%s' is an empty file\n", 618},
+  {"can't handle text lines longer than %d characters\n", 619},
+  {"input line longer than %d characters\n", 620},
+  {"trustdb rec %lu: lseek failed: %s\n", 621},
+  {"trustdb rec %lu: write failed (n=%d): %s\n", 622},
+  {"trustdb transaction too large\n", 623},
+  {"%s: can't access: %s\n", 624},
+  {"%s: directory does not exist!\n", 625},
+  {"%s: can't create: %s\n", 626},
+  {"%s: can't create lock\n", 627},
+  {"%s: failed to create version record: %s", 628},
+  {"%s: invalid trustdb created\n", 629},
+  {"%s: trustdb created\n", 630},
+  {"%s: invalid trustdb\n", 631},
+  {"%s: failed to create hashtable: %s\n", 632},
+  {"%s: error updating version record: %s\n", 633},
+  {"%s: error reading version record: %s\n", 634},
+  {"%s: error writing version record: %s\n", 635},
+  {"trustdb: lseek failed: %s\n", 636},
+  {"trustdb: read failed (n=%d): %s\n", 637},
+  {"%s: not a trustdb file\n", 638},
+  {"%s: version record with recnum %lu\n", 639},
+  {"%s: invalid file version %d\n", 640},
+  {"%s: error reading free record: %s\n", 641},
+  {"%s: error writing dir record: %s\n", 642},
+  {"%s: failed to zero a record: %s\n", 643},
+  {"%s: failed to append a record: %s\n", 644},
+  {"the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n", 645},
+  {"trust record %lu, req type %d: read failed: %s\n", 646},
+  {"trust record %lu, type %d: write failed: %s\n", 647},
+  {"trust record %lu: delete failed: %s\n", 648},
+  {"trustdb: sync failed: %s\n", 649},
+  {"error reading dir record for LID %lu: %s\n", 650},
+  {"lid %lu: expected dir record, got type %d\n", 651},
+  {"no primary key for LID %lu\n", 652},
+  {"error reading primary key for LID %lu: %s\n", 653},
+  {"get_dir_record: search_record failed: %s\n", 654},
+  {"'%s' is not a valid long keyID\n", 655},
+  {"key %08lX: can't put it into the trustdb\n", 656},
+  {"key %08lX: query record failed\n", 657},
+  {"key %08lX: already in trusted key table\n", 658},
+  {"key %08lX: accepted as trusted key.\n", 659},
+  {"key %08lX: no public key for trusted key - skipped\n", 660},
+  {"NOTE: secret key %08lX is NOT protected.\n", 661},
+  {"key %08lX: secret and public key don't match\n", 662},
+  {"enumerate secret keys failed: %s\n", 663},
+  {"key %08lX.%lu: Good subkey binding\n", 664},
+  {"key %08lX.%lu: Invalid subkey binding: %s\n", 665},
+  {"key %08lX.%lu: Valid key revocation\n", 666},
+  {"key %08lX.%lu: Invalid key revocation: %s\n", 667},
+  {"key %08lX.%lu: Valid subkey revocation\n", 668},
+  {"Good self-signature", 669},
+  {"Invalid self-signature", 670},
+  {"Valid user ID revocation skipped due to a newer self signature", 671},
+  {"Valid user ID revocation", 672},
+  {"Invalid user ID revocation", 673},
+  {"Valid certificate revocation", 674},
+  {"Good certificate", 675},
+  {"Invalid certificate revocation", 676},
+  {"Invalid certificate", 677},
+  {"sig record %lu[%d] points to wrong record.\n", 678},
+  {"duplicated certificate - deleted", 679},
+  {"tdbio_search_dir failed: %s\n", 680},
+  {"lid ?: insert failed: %s\n", 681},
+  {"lid %lu: insert failed: %s\n", 682},
+  {"lid %lu: inserted\n", 683},
+  {"error reading dir record: %s\n", 684},
+  {"%lu keys processed\n", 685},
+  {"\t%lu keys with errors\n", 686},
+  {"\t%lu keys inserted\n", 687},
+  {"enumerate keyblocks failed: %s\n", 688},
+  {"lid %lu: dir record w/o key - skipped\n", 689},
+  {"\t%lu due to new pubkeys\n", 690},
+  {"\t%lu keys skipped\n", 691},
+  {"\t%lu keys updated\n", 692},
+  {"Ooops, no keys\n", 693},
+  {"Ooops, no user IDs\n", 694},
+  {"check_trust: search dir record failed: %s\n", 695},
+  {"key %08lX: insert trust record failed: %s\n", 696},
+  {"key %08lX.%lu: inserted into trustdb\n", 697},
+  {"key %08lX.%lu: created in future (time warp or clock problem)\n", 698},
+  {"key %08lX.%lu: expired at %s\n", 699},
+  {"key %08lX.%lu: trust check failed: %s\n", 700},
+  {"user '%s' not found: %s\n", 701},
+  {"problem finding '%s' in trustdb: %s\n", 702},
+  {"user '%s' not in trustdb - inserting\n", 703},
+  {"failed to put '%s' into trustdb: %s\n", 704},
+  {"WARNING: can't yet handle long pref records\n", 705},
   {"\
 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", 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},
+should be the first file given on the command line.\n", 706},
+  {"input line %u too long or missing LF\n", 707},
+  {"%s: can't create keyring: %s\n", 708},
+  {"%s: keyring created\n", 709},
+  {"WARNING: 2 files with confidential information exists.\n", 710},
+  {"%s is the unchanged one\n", 711},
+  {"%s is the new one\n", 712},
+  {"Please fix this possible security flaw\n", 713},
+  {"key is not flagged as insecure - can't use it with the faked RNG!\n", 714},
+  {"skipped `%s': duplicated\n", 715},
+  {"skipped `%s': %s\n", 716},
+  {"skipped: secret key already present\n", 717},
   {"\
 skipped `%s': this is a PGP generated ElGamal key which is not secure for \
-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},
+signatures!\n", 718},
+  {"File `%s' exists. ", 719},
+  {"Overwrite (y/N)? ", 720},
+  {"%s: unknown suffix\n", 721},
+  {"Enter new filename", 722},
+  {"writing to stdout\n", 723},
+  {"assuming signed data in `%s'\n", 724},
+  {"%s: new options file created\n", 725},
+  {"%s: can't create directory: %s\n", 726},
+  {"%s: directory created\n", 727},
+  {"you have to start GnuPG again, so it can read the new options file\n", 728},
+  {"%s encrypted data\n", 729},
+  {"encrypted with unknown algorithm %d\n", 730},
+  {"\
+WARNING: message was encrypted with a weak key in the symmetric cipher.\n", 731},
+  {"problem handling encrypted packet\n", 732},
+  {"weak key created - retrying\n", 733},
+  {"cannot avoid weak key for symmetric cipher; tried %d times!\n", 734},
+  {"can't do that in batchmode without \"--yes\"\n", 735},
+  {"Delete this key from the keyring? ", 736},
+  {"This is a secret key! - really delete? ", 737},
+  {"there is a secret key for this public key!\n", 738},
+  {"use option \"--delete-secret-key\" to delete it first.\n", 739},
   {"\
 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.", 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},
+to do with the (implicitly created) web-of-certificates.", 740},
+  {"If you want to use this revoked key anyway, answer \"yes\".", 741},
+  {"If you want to use this untrusted key anyway, answer \"yes\".", 742},
   {"\
-Enter the user ID of the addressee to whom you want to send the message.", 726},
+Enter the user ID of the addressee to whom you want to send the message.", 743},
   {"\
 Select the algorithm to use.\n\
 \n\
@@ -875,60 +895,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.", 727},
+this menu.", 744},
   {"\
 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.", 728},
-  {"Enter the size of the key", 729},
-  {"Answer \"yes\" or \"no\"", 730},
+with them are quite large and very slow to verify.", 745},
+  {"Enter the size of the key", 746},
+  {"Answer \"yes\" or \"no\"", 747},
   {"\
 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.", 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},
+the given value as an interval.", 748},
+  {"Enter the name of the key holder", 749},
+  {"please enter an optional but highly suggested email address", 750},
+  {"Please enter an optional comment", 751},
   {"\
 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.", 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},
+Q  to to quit the key generation.", 752},
+  {"Answer \"yes\" (or just \"y\") if it is okay to generate the sub key.", 753},
+  {"Answer \"yes\" is you want to sign ALL the user IDs", 754},
   {"\
 Answer \"yes\" if you really want to delete this user ID.\n\
-All certificates are then also lost!", 738},
-  {"Answer \"yes\" if it is okay to delete the subkey", 739},
+All certificates are then also lost!", 755},
+  {"Answer \"yes\" if it is okay to delete the subkey", 756},
   {"\
 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.", 740},
+trust connection to the key or another key certified by this key.", 757},
   {"\
 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.", 741},
+a trust connection through another already certified key.", 758},
   {"\
 The signature is not valid.  It does make sense to remove it from\n\
-your keyring.", 742},
+your keyring.", 759},
   {"\
 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.", 743},
+a second one is available.", 760},
   {"\
 Please enter the passhrase; this is a secret sentence \n\
-  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},
+  Blurb, blurb,.... ", 761},
+  {"Please repeat the last passphrase, so you are sure what you typed in.", 762},
+  {"Give the name of the file to which the signature applies", 763},
+  {"Answer \"yes\" if it is okay to overwrite the file", 764},
   {"\
 Please enter a new filename. If you just hit RETURN the default\n\
-file (which is shown in brackets) will be used.", 748},
+file (which is shown in brackets) will be used.", 765},
   {"\
 You should specify a reason for the certification.  Depending on the\n\
 context you have the ability to choose from this list:\n\
@@ -941,13 +961,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", 749},
+      this is normally used to mark an email address invalid.\n", 766},
   {"\
 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", 750},
-  {"No help available", 751},
-  {"No help available for `%s'", 752},
+An empty line ends the text.\n", 767},
+  {"No help available", 768},
+  {"No help available for `%s'", 769},
 };
 
-int _msg_tbl_length = 752;
+int _msg_tbl_length = 769;
diff -urN gnupg-1.0.4/po/da.po gnupg-1.0.5/po/da.po
--- gnupg-1.0.4/po/da.po	Tue Oct 17 15:40:35 2000
+++ gnupg-1.0.5/po/da.po	Sun Apr 29 16:39:22 2001
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-10-16 19:22+0200\n"
+"POT-Creation-Date: 2001-04-29 16:39+0200\n"
 "PO-Revision-Date: 2000-03-07 22:51+01:00\n"
 "Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -19,35 +19,35 @@
 msgid "Warning: using insecure memory!\n"
 msgstr "Advarsel: benytter ubeskyttet hukommelse!\n"
 
-#: util/secmem.c:295
+#: util/secmem.c:299
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operation er ikke mulig uden beskyttet hukommelse indlæst\n"
 
-#: util/secmem.c:296
+#: util/secmem.c:300
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan have brugt et forkert program til denne opgave)\n"
 
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:287 util/miscutil.c:316
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:288 util/miscutil.c:319
 msgid "yY"
 msgstr "jJ"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:289 util/miscutil.c:317
 msgid "no"
 msgstr "n"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:290 util/miscutil.c:320
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:318
 msgid "quit"
 msgstr "afslut"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:321
 msgid "qQ"
 msgstr "aA"
 
@@ -247,6 +247,17 @@
 msgid "not processed"
 msgstr "ikke bearbejdet"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "dårlig offentlig nøgle"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "dårlig hemmelig nøgle"
+
 #: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -257,63 +268,63 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du fandt en fejl ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke åbne '%s': %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:324
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan ikke åbne '%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:329
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:325
+#: cipher/random.c:334
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:331
+#: cipher/random.c:340
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:339
+#: cipher/random.c:348
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan ikke åbne '%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:386
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:397
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:413
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan ikke åbne '%s': %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:416
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan ikke åbne '%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:427
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:650
+#: cipher/random.c:661
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ADVARSEL: bruger usikker tilfældig-nummer-generator!!!\n"
 
-#: cipher/random.c:651
+#: cipher/random.c:662
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -338,7 +349,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:206
+#: g10/g10.c:216
 msgid ""
 "@Commands:\n"
 " "
@@ -346,139 +357,139 @@
 "@Kommandoer:\n"
 " "
 
-#: g10/g10.c:208
+#: g10/g10.c:218
 msgid "|[file]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: g10/g10.c:209
+#: g10/g10.c:219
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/g10.c:210
+#: g10/g10.c:220
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/g10.c:211
+#: g10/g10.c:221
 msgid "encrypt data"
 msgstr "kryptér data"
 
-#: g10/g10.c:212
+#: g10/g10.c:222
 msgid "encryption only with symmetric cipher"
 msgstr "kryptér kun med symmetriske cifre"
 
-#: g10/g10.c:213
+#: g10/g10.c:223
 msgid "store only"
 msgstr "gem kun"
 
-#: g10/g10.c:214
+#: g10/g10.c:224
 msgid "decrypt data (default)"
 msgstr "afkryptér data (standard)"
 
-#: g10/g10.c:215
+#: g10/g10.c:225
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/g10.c:217
+#: g10/g10.c:227
 msgid "list keys"
 msgstr "vis nøgler"
 
-#: g10/g10.c:219
+#: g10/g10.c:229
 msgid "list keys and signatures"
 msgstr "vis nøgler og signaturer"
 
-#: g10/g10.c:220
+#: g10/g10.c:230
 msgid "check key signatures"
 msgstr "tjek nøglesignaturer"
 
-#: g10/g10.c:221
+#: g10/g10.c:231
 msgid "list keys and fingerprints"
 msgstr "vis nøgle og fingeraftryk"
 
-#: g10/g10.c:222
+#: g10/g10.c:232
 msgid "list secret keys"
 msgstr "vis hemmelige nøgler"
 
-#: g10/g10.c:223
+#: g10/g10.c:233
 msgid "generate a new key pair"
 msgstr "generér et nyt nøglepar"
 
-#: g10/g10.c:224
+#: g10/g10.c:234
 msgid "remove key from the public keyring"
 msgstr "fjern nøgle fra den offentlige nøglering"
 
-#: g10/g10.c:226
+#: g10/g10.c:236
 msgid "remove key from the secret keyring"
 msgstr "fjern nøgle fra den hemmelige nøglering"
 
-#: g10/g10.c:227
+#: g10/g10.c:237
 msgid "sign a key"
 msgstr "signér en nøgle"
 
-#: g10/g10.c:228
+#: g10/g10.c:238
 msgid "sign a key locally"
 msgstr "signér en nøgle lokalt"
 
-#: g10/g10.c:229
+#: g10/g10.c:239
 msgid "sign or edit a key"
 msgstr "signér eller redigér en nøgle"
 
-#: g10/g10.c:230
+#: g10/g10.c:240
 msgid "generate a revocation certificate"
 msgstr "Generér en annullérbar certifikat"
 
-#: g10/g10.c:231
+#: g10/g10.c:241
 msgid "export keys"
 msgstr "eksportér nøgler"
 
-#: g10/g10.c:232
+#: g10/g10.c:242
 msgid "export keys to a key server"
 msgstr "eksportér nøgler til en nøgletjener"
 
-#: g10/g10.c:233
+#: g10/g10.c:243
 msgid "import keys from a key server"
 msgstr "importér nøgler fra en nøgleserver"
 
-#: g10/g10.c:237
+#: g10/g10.c:247
 msgid "import/merge keys"
 msgstr "importér/fusionér nøgler"
 
-#: g10/g10.c:239
+#: g10/g10.c:249
 msgid "list only the sequence of packets"
 msgstr "vis kun pakkesekvensen"
 
-#: g10/g10.c:241
+#: g10/g10.c:251
 msgid "export the ownertrust values"
 msgstr "eksportér ejertillidsværdierne"
 
-#: g10/g10.c:243
+#: g10/g10.c:253
 msgid "import ownertrust values"
 msgstr "importér ejertillidsværdierne"
 
-#: g10/g10.c:245
+#: g10/g10.c:255
 msgid "update the trust database"
 msgstr "opdatér tillidsdatabasen"
 
-#: g10/g10.c:247
+#: g10/g10.c:257
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMES]|tjek tillidsdatabasen"
 
-#: g10/g10.c:248
+#: g10/g10.c:258
 msgid "fix a corrupted trust database"
 msgstr "reparér en ødelagt tillidsdatabase"
 
-#: g10/g10.c:249
+#: g10/g10.c:259
 msgid "De-Armor a file or stdin"
 msgstr "De-beskydt en fil el. stdin"
 
-#: g10/g10.c:251
+#: g10/g10.c:261
 msgid "En-Armor a file or stdin"
 msgstr "Beskydt en fil el. stdin"
 
-#: g10/g10.c:253
+#: g10/g10.c:263
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresumé"
 
-#: g10/g10.c:257
+#: g10/g10.c:267
 msgid ""
 "@\n"
 "Options:\n"
@@ -488,158 +499,162 @@
 "Indstillinger:\n"
 " "
 
-#: g10/g10.c:259
+#: g10/g10.c:269
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/g10.c:261
+#: g10/g10.c:271
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|kryptér for NAME"
 
-#: g10/g10.c:264
+#: g10/g10.c:274
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: g10/g10.c:266
+#: g10/g10.c:276
 msgid "use the default key as default recipient"
 msgstr "brug standard nøglen som standard modtager"
 
-#: g10/g10.c:270
+#: g10/g10.c:280
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/g10.c:271
+#: g10/g10.c:281
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sæt kompresningsniveau N (0 = slået fra)"
 
-#: g10/g10.c:273
+#: g10/g10.c:283
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/g10.c:274
+#: g10/g10.c:284
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/g10.c:275
+#: g10/g10.c:285
 msgid "verbose"
 msgstr "meddelsom"
 
-#: g10/g10.c:276
+#: g10/g10.c:286
 msgid "be somewhat more quiet"
 msgstr "vær mere stille"
 
-#: g10/g10.c:277
+#: g10/g10.c:287
 msgid "don't use the terminal at all"
 msgstr "brug overhovedet ikke terminalen"
 
-#: g10/g10.c:278
+#: g10/g10.c:288
 msgid "force v3 signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:279
+#: g10/g10.c:289
 msgid "always use a MDC for encryption"
 msgstr "brug altid en MDC for kryptering"
 
-#: g10/g10.c:280
+#: g10/g10.c:290
 msgid "do not make any changes"
 msgstr "lav ingen ændringer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:282
+#: g10/g10.c:292
+msgid "use the gpg-agent"
+msgstr ""
+
+#: g10/g10.c:293
 msgid "batch mode: never ask"
 msgstr "kørselsmodus: spørg aldrig"
 
-#: g10/g10.c:283
+#: g10/g10.c:294
 msgid "assume yes on most questions"
 msgstr "forvent ja til de fleste sprøgsmål"
 
-#: g10/g10.c:284
+#: g10/g10.c:295
 msgid "assume no on most questions"
 msgstr "forvent nej til de fleste sprøgsmål"
 
-#: g10/g10.c:285
+#: g10/g10.c:296
 msgid "add this keyring to the list of keyrings"
 msgstr "tilføj denne nøglering til nøgleringslisten"
 
-#: g10/g10.c:286
+#: g10/g10.c:297
 msgid "add this secret keyring to the list"
 msgstr "tilføj denne hemmeligenøglering til listen"
 
-#: g10/g10.c:287
+#: g10/g10.c:298
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|brug NAME som standard hemmelignøgle"
 
-#: g10/g10.c:288
+#: g10/g10.c:299
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|brug denne nøgletjener til at slå nøgler op"
 
-#: g10/g10.c:289
+#: g10/g10.c:300
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|sæt terminal karaktersæt til NAME"
 
-#: g10/g10.c:290
+#: g10/g10.c:301
 msgid "read options from file"
 msgstr "læs indstillinger fra fil"
 
-#: g10/g10.c:294
+#: g10/g10.c:305
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinfo til denne FD"
 
-#: g10/g10.c:299
+#: g10/g10.c:310
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:300
+#: g10/g10.c:311
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|indlæs udvidelsesmodul FILE"
 
-#: g10/g10.c:301
+#: g10/g10.c:312
 msgid "emulate the mode described in RFC1991"
 msgstr "emulér modusen beskrevet i RFC1991"
 
-#: g10/g10.c:302
+#: g10/g10.c:313
 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:303
+#: g10/g10.c:314
 msgid "|N|use passphrase mode N"
 msgstr "|N|brug pasfrasemodus N"
 
-#: g10/g10.c:305
+#: g10/g10.c:316
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|brug meddelelses resuméalgoritme NAME for pasfrase"
 
-#: g10/g10.c:307
+#: g10/g10.c:318
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|brug cifrealgoritme NAME for pasfrase"
 
-#: g10/g10.c:308
+#: g10/g10.c:319
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|brug cifferalgoritme NAME"
 
-#: g10/g10.c:309
+#: g10/g10.c:320
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|brug meddelelsesresumé algoritme NAME"
 
-#: g10/g10.c:310
+#: g10/g10.c:321
 msgid "|N|use compress algorithm N"
 msgstr "|N|brug kompresalgoritme N"
 
-#: g10/g10.c:311
+#: g10/g10.c:322
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 
-#: g10/g10.c:312
+#: g10/g10.c:323
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=VALUE|brug denne notationsdata"
 
-#: g10/g10.c:315
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:318
+#: g10/g10.c:329
 msgid ""
 "@\n"
 "Examples:\n"
@@ -659,16 +674,16 @@
 " --list-keys [navne]        vis nøgler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/g10.c:418
+#: g10/g10.c:438
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Rapportér venligst fejl til <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:422
+#: g10/g10.c:442
 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:425
+#: g10/g10.c:445
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -678,7 +693,7 @@
 "sign, check, encrypt eller decrypt\n"
 "standard operation afhænger af inddata\n"
 
-#: g10/g10.c:432
+#: g10/g10.c:452
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -686,282 +701,287 @@
 "\n"
 "Understøttede algoritmer:\n"
 
-#: g10/g10.c:511
+#: g10/g10.c:531
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/g10.c:564
+#: g10/g10.c:584
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/g10.c:704
+#: g10/g10.c:734
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:708
+#: g10/g10.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/g10.c:715
+#: g10/g10.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "læser indstillinger fra `%s'\n"
 
-#: g10/g10.c:905
+#: g10/g10.c:950
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegnsæt\n"
 
-#: g10/g10.c:970
+#: g10/g10.c:1024
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:974 g10/g10.c:983
+#: g10/g10.c:1028 g10/g10.c:1037
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/g10.c:976
+#: g10/g10.c:1030
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/g10.c:979
+#: g10/g10.c:1033
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsløs sammen med %s!\n"
 
-#: g10/g10.c:998 g10/g10.c:1010
+#: g10/g10.c:1053 g10/g10.c:1065
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/g10.c:1004 g10/g10.c:1016
+#: g10/g10.c:1059 g10/g10.c:1071
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resuméalgoritme er ugyldig\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1075
 msgid "the given policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1078
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr ""
 
-#: g10/g10.c:1025
+#: g10/g10.c:1080
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:1027
+#: g10/g10.c:1082
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:1029
+#: g10/g10.c:1084
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:1032
+#: g10/g10.c:1087
 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:1036
+#: g10/g10.c:1091
 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:1121
+#: g10/g10.c:1176
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/g10.c:1127
+#: g10/g10.c:1182
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/g10.c:1134
+#: g10/g10.c:1189
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:1142
+#: g10/g10.c:1197
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1210
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1223
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1237
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/g10.c:1199
+#: g10/g10.c:1254
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1262
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1270
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1278
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/g10.c:1239
+#: g10/g10.c:1294
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key bruger-id"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1297
 msgid "--delete-key user-id"
 msgstr "--delete-key bruger-id"
 
-#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
+#: g10/g10.c:1305
+#, fuzzy
+msgid "--delete-secret-and-public-key user-id"
+msgstr "--delete-secret-key bruger-id"
+
+#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan ikke åbne %s: %s\n"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1357
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [nøglering]"
 
-#: g10/g10.c:1360
+#: g10/g10.c:1423
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:1368
+#: g10/g10.c:1431
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "påklædning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:1439
+#: g10/g10.c:1502
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/g10.c:1520
+#: g10/g10.c:1589
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/g10.c:1524
+#: g10/g10.c:1593
 msgid "Go ahead and type your message ...\n"
 msgstr "Gå til sagen og skriv meddelelsen ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke åbne `%s'\n"
 
-#: g10/g10.c:1737
+#: g10/g10.c:1805
 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:1743
+#: g10/g10.c:1811
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1749
+#: g10/g10.c:1817
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1757
+#: g10/g10.c:1825
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsværdi må ikke bruge nogen kontroltegn\n"
 
-#: g10/armor.c:302
+#: g10/armor.c:306
 #, c-format
 msgid "armor: %s\n"
 msgstr "panser: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:335
 msgid "invalid armor header: "
 msgstr "ugyldigt panserhoved: "
 
-#: g10/armor.c:338
+#: g10/armor.c:342
 msgid "armor header: "
 msgstr "panserhoved: "
 
-#: g10/armor.c:349
+#: g10/armor.c:353
 msgid "invalid clearsig header\n"
 msgstr ""
 
-#: g10/armor.c:401
+#: g10/armor.c:405
 msgid "nested clear text signatures\n"
 msgstr ""
 
-#: g10/armor.c:525
+#: g10/armor.c:529
 msgid "invalid dash escaped line: "
 msgstr ""
 
-#: g10/armor.c:537
+#: g10/armor.c:541
 msgid "unexpected armor:"
 msgstr "uforventet beskyttelse:"
 
-#: g10/armor.c:654
+#: g10/armor.c:667 g10/armor.c:1235
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ugyldigt radix64 tegn %02x udeladt\n"
 
-#: g10/armor.c:697
+#: g10/armor.c:710
 msgid "premature eof (no CRC)\n"
 msgstr "for tidlig eof (ingen CRC)\n"
 
-#: g10/armor.c:731
+#: g10/armor.c:744
 msgid "premature eof (in CRC)\n"
 msgstr "for tidlig eof (i CRC)\n"
 
-#: g10/armor.c:735
+#: g10/armor.c:748
 msgid "malformed CRC\n"
 msgstr "dårlig CRC\n"
 
-#: g10/armor.c:739
+#: g10/armor.c:752 g10/armor.c:1272
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "CRC fejl; %06lx - %06lx\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:772
 msgid "premature eof (in Trailer)\n"
 msgstr "for tidlig eof (i trailer)\n"
 
-#: g10/armor.c:760
+#: g10/armor.c:776
 msgid "error in trailer line\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/armor.c:906
+#: g10/armor.c:922
 msgid "For info see http://www.gnupg.org"
 msgstr ""
 
-#: g10/armor.c:1027
+#: g10/armor.c:1050
 msgid "no valid OpenPGP data found.\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/armor.c:1032
+#: g10/armor.c:1055
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ugyldigt panser: linie længere end %d tegn\n"
 
-#: g10/armor.c:1036
+#: g10/armor.c:1059
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "quoted printable-tegn i panser - måske pga. en fejlbehæftet MTA\n"
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "             Fingeraftryk:"
 
@@ -1164,17 +1184,17 @@
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det er ikke sikkert at signaturen tilhører ejeren.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: udelod: offentlig nøgle er allerede tilstede\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1182,42 +1202,42 @@
 "Du angav ikke en bruger-id. (du kan bruge \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "Indtast bruger-id: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "Ingen sådan bruger-id.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 msgid "skipped: public key already set as default recipient\n"
 msgstr "udeladt: offentlig nøgle er allerede valgt som standard modtager\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
 msgstr "Offentlig nøgle er slået fra.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "udeladt: offentlig nøgle er allerede valgt med --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: fejl ved undersøgelse af nøgle: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: udelod: offentlignøgle er slået fra\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "ingen gyldige adresser\n"
 
@@ -1225,62 +1245,66 @@
 msgid "writing self signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:214
+#: g10/keygen.c:217
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
+#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ønsket nøglestørrelse er %u bit\n"
 
-#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
+#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:549
 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:542
+#: g10/keygen.c:551
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA og ElGamal (standard)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:552
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signér kun)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:554
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (kryptér kun)\n"
 
-#: g10/keygen.c:546
+#: g10/keygen.c:555
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signér og kryptér)\n"
 
-#: g10/keygen.c:548
+#: g10/keygen.c:557
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signér og kryptér)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:561
 msgid "Your selection? "
 msgstr "Dit valg? "
 
-#: g10/keygen.c:563 g10/keygen.c:571
+#: g10/keygen.c:572
 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:585
+#: g10/keygen.c:580
+msgid "The use of this algorithm is deprecated - create anyway? "
+msgstr ""
+
+#: g10/keygen.c:594
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
-#: g10/keygen.c:597
+#: g10/keygen.c:606
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1289,19 +1313,19 @@
 "    highest suggested keysize is 2048 bits\n"
 msgstr ""
 
-#: g10/keygen.c:604
+#: g10/keygen.c:613
 msgid "What keysize do you want? (1024) "
 msgstr "Hvilken nøglestørrelse ønsker du? (1024) "
 
-#: g10/keygen.c:609
+#: g10/keygen.c:618
 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:611
+#: g10/keygen.c:620
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr ""
 
-#: g10/keygen.c:613
+#: g10/keygen.c:622
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 
@@ -1313,42 +1337,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:624
+#: g10/keygen.c:633
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr ""
 
-#: g10/keygen.c:629
+#: g10/keygen.c:638
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
 msgstr ""
 
-#: g10/keygen.c:632
+#: g10/keygen.c:641
 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:633
+#: g10/keygen.c:642
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
 msgstr ""
 
-#: g10/keygen.c:641
+#: g10/keygen.c:650
 msgid "Do you really need such a large keysize? "
 msgstr ""
 
-#: g10/keygen.c:647
+#: g10/keygen.c:656
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Ønsket nøglestørrelse er %u bit\n"
 
-#: g10/keygen.c:650 g10/keygen.c:654
+#: g10/keygen.c:659 g10/keygen.c:663
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:702
+#: g10/keygen.c:711
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1358,36 +1382,36 @@
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:717
+#: g10/keygen.c:726
 msgid "Key is valid for? (0) "
 msgstr "Nøgle er gyldig for? (0) "
 
-#: g10/keygen.c:722
+#: g10/keygen.c:731
 msgid "invalid value\n"
 msgstr "ugyldig værdi\n"
 
-#: g10/keygen.c:727
+#: g10/keygen.c:736
 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:733
+#: g10/keygen.c:742
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nøgle udløber d. %s\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:745
 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:741
+#: g10/keygen.c:750
 msgid "Is this correct (y/n)? "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/keygen.c:784
+#: g10/keygen.c:793
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1397,44 +1421,44 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:796
+#: g10/keygen.c:805
 msgid "Real name: "
 msgstr "Rigtige navn: "
 
-#: g10/keygen.c:804
+#: g10/keygen.c:813
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:806
+#: g10/keygen.c:815
 msgid "Name may not start with a digit\n"
 msgstr "Navn må ikke starte med et tal\n"
 
-#: g10/keygen.c:808
+#: g10/keygen.c:817
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navn skal være mindst 5 bogstaver langt\n"
 
-#: g10/keygen.c:816
+#: g10/keygen.c:825
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:827
+#: g10/keygen.c:836
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:835
+#: g10/keygen.c:844
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:841
+#: g10/keygen.c:850
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:864
+#: g10/keygen.c:873
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruger '%s' tegnsættet.\n"
 
-#: g10/keygen.c:870
+#: g10/keygen.c:879
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1445,28 +1469,28 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:883
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:879
+#: g10/keygen.c:888
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:889
+#: g10/keygen.c:898
 #, 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:890
+#: g10/keygen.c:899
 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:909
+#: g10/keygen.c:918
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:947
+#: g10/keygen.c:956
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1474,11 +1498,11 @@
 "Du skal bruge en kodesætning til at beskytte din hemmelige nøgle.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:964
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "kodesætningen blev ikke ordentlig gentaget; prøv igen.\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:970
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1486,7 +1510,7 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:982
+#: g10/keygen.c:991
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1494,56 +1518,56 @@
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:1431
+#: g10/keygen.c:1440
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA nøglepar vil have 1024 bit.\n"
 
-#: g10/keygen.c:1474
+#: g10/keygen.c:1483
 msgid "Key generation canceled.\n"
 msgstr "Nøgleoprettelse annulleret.\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1581
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1582
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1679
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig nøgle oprettet og signeret.\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1684
 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:1690 g10/keygen.c:1791
+#: g10/keygen.c:1701 g10/keygen.c:1807
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1748 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:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1750 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:1769
+#: g10/keygen.c:1783
 msgid "Really create? "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1554,17 +1578,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodesætning: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ADVARSEL: tom fil\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "læser fra '%s'\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s krypteret for: %s\n"
@@ -1589,280 +1613,280 @@
 msgid "key %08lX: not protected - skipped\n"
 msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:214
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:350
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+#, fuzzy
+msgid "[User id not found]"
+msgstr "%s: bruger ikke fundet\n"
+
+#: g10/getkey.c:453
 msgid "too many entries in unk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr "RSA nøgle kan ikke bruges i denne version\n"
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
-msgstr "Ingen nøgle for bruger-ID\n"
-
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
-msgstr "Ingen bruger-ID for nøgle\n"
-
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2207
 #, 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:2050
-#, fuzzy
-msgid "[User id not found]"
-msgstr "%s: bruger ikke fundet\n"
+#: g10/getkey.c:2249 g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr ""
 
-#: g10/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "sprang over blok af typen %d\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 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:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fejl ved læsning af '%s': %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antal behandlede: %lu\n"
 
-#: g10/import.c:206
+#: g10/import.c:208
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       nye undernøgler: %lu\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              uændrede: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nye bruger-id'er: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nye undernøgler: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        nye signaturer: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  nye nøgletilbagekald: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " hemmelige nøgler læst: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "hemmelige nøgler import: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "hemmelige nøgler uændre: %lu\n"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "nøgle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "nøgle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:418 g10/import.c:657
+#: g10/import.c:435 g10/import.c:684
 #, 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:423
+#: g10/import.c:440
 #, 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
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "ingen standard offentlig nøglering\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "kan ikke låse nøglering `%s': %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fejl ved skrivning af nøglering `%s': %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "nøgle %08lX: offentlig nøgle importeret\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "nøgle %08lX: stemmer ikke med vores kopi\n"
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:489 g10/import.c:692
 #, 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:478 g10/import.c:671
+#: g10/import.c:495 g10/import.c:698
 #, 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:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr ""
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr ""
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr ""
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr ""
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr ""
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr ""
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr ""
 
-#: g10/import.c:613
+#: g10/import.c:610
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:640
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr ""
 
 #. we can't merge secret keys
-#: g10/import.c:617
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr ""
 
-#: g10/import.c:622
+#: g10/import.c:649
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr ""
 
-#: g10/import.c:651
+#: g10/import.c:678
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 
-#: g10/import.c:682
+#: g10/import.c:709
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 
-#: g10/import.c:714
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr ""
 
-#: g10/import.c:756
+#: g10/import.c:783
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr ""
 
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:790 g10/import.c:814
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr ""
 
-#: g10/import.c:764
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr ""
 
-#: g10/import.c:779
+#: g10/import.c:806
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr ""
 
-#: g10/import.c:788
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr ""
 
-#: g10/import.c:815
+#: g10/import.c:842
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr ""
 
-#: g10/import.c:844
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr ""
 
-#: g10/import.c:867
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr ""
@@ -1871,732 +1895,735 @@
 #. * 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:892
+#: g10/import.c:919
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr ""
 
-#: g10/import.c:901
+#: g10/import.c:928
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:909
+#: g10/import.c:936
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 
-#: g10/import.c:1009
+#: g10/import.c:1036
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1060
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr ""
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr ""
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: bruger ikke fundet\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr "[selv-signatur]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
 msgstr "1 dårlig signature\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d dårlige signaturer\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
 msgstr ""
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr ""
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
 msgstr ""
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr ""
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
 msgstr ""
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr ""
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr ""
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr ""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "Denne nøgle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:432
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "hemmelig nøgle ikke tilgængelig"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "Nøglen er beskyttet.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan ikke redigere denne nøgle: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "Vil du virkelig gerne gøre dette?"
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr "a"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr "gem"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "gem og afslut"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr "hjælp"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "vis denne hjælp"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr "vis"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
 msgstr "vis nøgler og bruger-id'er"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr "nøgle"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "vælg sekundær nøgle N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr "tjek"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr "vis signaturer"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr "signér"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr "signér nøglen"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr "lsignér"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
 msgstr "signér nøglen lokalt"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr "aflus"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr "tilføj-bid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
 msgstr "tilføj bruger-id"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr "sletbid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
 msgstr "slet bruger id"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr "tilføj nøgle"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr "tilføj sekundær nøgle"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr "sletnøgle"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "slet sekundær nøgle"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
 msgstr "sletsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
 msgstr "slet signaturer"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr "udløb"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr "ændr udløbsdatoen"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr "skift"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "skift imellem hemmelig og offentlig nøgle visning"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr "s"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr "præf"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606 g10/keyedit.c:607
 msgid "list preferences"
 msgstr "vis præferencer"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "præf"
+
+#: g10/keyedit.c:608
 msgid "passwd"
 msgstr "kodeord"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:608
 msgid "change the passphrase"
 msgstr "ændr kodesætningen"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "trust"
 msgstr "betro"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revsig"
 msgstr ""
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revoke signatures"
 msgstr ""
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revkey"
 msgstr ""
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revoke a secondary key"
 msgstr ""
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable"
 msgstr "slåfra"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable a key"
 msgstr "slå nøgle fra"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable"
 msgstr "slåtil"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable a key"
 msgstr "slå nøgle til"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:633
 msgid "can't do that in batchmode\n"
 msgstr ""
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:669
+#: g10/keyedit.c:671
 msgid "Secret key is available.\n"
 msgstr ""
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:700
 msgid "Command> "
 msgstr ""
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:781
 msgid "Really sign all user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:782
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:814 g10/keyedit.c:1000
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:825 g10/keyedit.c:846
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:827
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:830
 msgid "Really remove all selected user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:831
 msgid "Really remove this user ID? "
 msgstr ""
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:867 g10/keyedit.c:889
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:871
 msgid "Do you really want to delete the selected keys? "
 msgstr ""
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:872
 msgid "Do you really want to delete this key? "
 msgstr ""
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke the selected keys? "
 msgstr ""
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:894
 msgid "Do you really want to revoke this key? "
 msgstr ""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
 msgid "Save changes? "
 msgstr "Gem ændringer? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:967
 msgid "Quit without saving? "
 msgstr "Afslut uden at gemme? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:978
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:985
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:992
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1007
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1090
+#: g10/keyedit.c:1140
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1144
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1173
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "nøgle %08lX: undernøgle er blevet annulleret!\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1176
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "  nye nøgletilbagekald: %lu\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1178
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1420
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1424
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1428
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1434
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1448
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1449
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1452
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1521
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1527
 msgid "Please select at most one secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1531
 msgid "Changing expiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1533
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1575
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1591
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1652
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1698
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekundær nøgle med indeks %d\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1796
 msgid "user ID: \""
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1799
 #, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1803
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr ""
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1827
 msgid "You have signed these user IDs:\n"
 msgstr ""
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1846
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1866
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1884
 msgid "Really create the revocation certificates? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1913
 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:400 g10/mainproc.c:790
+#: g10/keylist.c:279 g10/mainproc.c:851
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Nøgle udløber d. %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:269
 #, c-format
 msgid "public key is %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:314
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:366
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr ""
 
-#: g10/mainproc.c:336
+#: g10/mainproc.c:376
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr ""
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:390
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:430
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:435
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:440
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:459
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:461
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:632
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:719 g10/mainproc.c:728
 msgid "WARNING: invalid notation data found\n"
 msgstr ""
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:731
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:680
+#: g10/mainproc.c:740
 msgid "Policy: "
 msgstr "Politik: "
 
-#: g10/mainproc.c:1121
+#: g10/mainproc.c:1193
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1158
+#. plaintext before signatures but no one-pass packets
+#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#, fuzzy
+msgid "can't handle these multiple signatures\n"
+msgstr "opret en separat signatur"
+
+#: g10/mainproc.c:1256
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1184 g10/mainproc.c:1195
+#: g10/mainproc.c:1284 g10/mainproc.c:1292
 msgid "BAD signature from \""
 msgstr "DÅRLIG signatur fra \""
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1196
+#: g10/mainproc.c:1285 g10/mainproc.c:1293
 msgid "Good signature from \""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1243
+#: g10/mainproc.c:1358
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/mainproc.c:1318
+#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "opret en separat signatur"
+
+#: g10/mainproc.c:1454
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1511
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
 
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1518
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan ikke slå core-dump fra: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr ""
 
-#: g10/misc.c:234
-msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
+#: g10/misc.c:238
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
 
 #: g10/parse-packet.c:119
@@ -2604,37 +2631,85 @@
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:991
+#: g10/parse-packet.c:1010
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:159
+#: g10/passphrase.c:223
+msgid "gpg-agent is not available in this session\n"
+msgstr ""
+
+#: g10/passphrase.c:229
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr ""
+
+#: g10/hkp.c:167 g10/passphrase.c:248
+#, fuzzy, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "kan ikke åbne '%s': %s\n"
+
+#: g10/passphrase.c:313 g10/passphrase.c:576
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr " (hovednøgle-ID %08lX)"
+
+#: g10/passphrase.c:323
+#, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+
+#: g10/passphrase.c:344
+#, fuzzy
+msgid "Enter passphrase\n"
+msgstr "Indtast kodesætning: "
+
+#: g10/passphrase.c:346
+#, fuzzy
+msgid "Repeat passphrase\n"
+msgstr "Gentag kodesætning: "
+
+#: g10/passphrase.c:384
+msgid "passphrase too long\n"
+msgstr ""
+
+#: g10/passphrase.c:396
+msgid "invalid response from agent\n"
+msgstr ""
+
+#: g10/passphrase.c:405
+msgid "cancelled by user\n"
+msgstr ""
+
+#: g10/passphrase.c:408 g10/passphrase.c:477
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr ""
+
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
 "user: \""
 msgstr ""
 
-#: g10/passphrase.c:168
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr ""
 
-#: g10/passphrase.c:173
-#, c-format
-msgid " (main key ID %08lX)"
-msgstr " (hovednøgle-ID %08lX)"
-
-#: g10/passphrase.c:190
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
 msgstr ""
 
-#: g10/passphrase.c:194
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr "Indtast kodesætning: "
 
-#: g10/passphrase.c:198
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr "Gentag kodesætning: "
 
@@ -2642,19 +2717,23 @@
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:324
+#: g10/plaintext.c:332
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:328
+#: g10/plaintext.c:336
 msgid "Please enter name of data file: "
 msgstr ""
 
-#: g10/plaintext.c:349
+#: g10/plaintext.c:357
 msgid "reading stdin ...\n"
 msgstr "læser stdin ...\n"
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:391
+msgid "no signed data\n"
+msgstr ""
+
+#: g10/plaintext.c:399
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
@@ -2687,41 +2766,36 @@
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr ""
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr ""
 
-#: g10/hkp.c:85
+#: g10/hkp.c:83
 #, fuzzy, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "importér nøgler fra en nøgleserver"
 
-#: g10/hkp.c:109 g10/hkp.c:148
+#: g10/hkp.c:102 g10/hkp.c:136
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/hkp.c:117
+#: g10/hkp.c:110
 #, fuzzy, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s er ikke et gyldigt tegnsæt\n"
 
-#: 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:194
+#: g10/hkp.c:191
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "fejl ved læsning af '%s': %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:203
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:209
+#: g10/hkp.c:206
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
@@ -2763,30 +2837,35 @@
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:324
+#: g10/sig-check.c:328
 #, c-format
-msgid "NOTE: signature key expired %s\n"
+msgid "NOTE: signature key %08lX expired %s\n"
 msgstr ""
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sign.c:140
+#: g10/sign.c:152
+#, fuzzy, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "Kan ikke tjekke signatur: %s\n"
+
+#: g10/sign.c:161
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:307 g10/sign.c:630
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:405
 msgid "signing:"
 msgstr "signerer:"
 
-#: g10/sign.c:431
+#: g10/sign.c:448
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
@@ -2825,7 +2904,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
+#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr ""
@@ -3005,11 +3084,6 @@
 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"
@@ -3217,14 +3291,14 @@
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr ""
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
@@ -3234,39 +3308,49 @@
 msgid "%s: can't create keyring: %s\n"
 msgstr ""
 
-#: g10/ringedit.c:319 g10/ringedit.c:1374
+#: g10/ringedit.c:319 g10/ringedit.c:1376
 #, c-format
 msgid "%s: keyring created\n"
 msgstr ""
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1557
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1558
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1559
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1560
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr ""
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr ""
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+#, fuzzy
+msgid "skipped: secret key already present\n"
+msgstr "%s: udelod: offentlig nøgle er allerede tilstede\n"
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3292,31 +3376,31 @@
 msgid "Enter new filename"
 msgstr "Indtast nyt filnavn"
 
-#: g10/openfile.c:182
+#: g10/openfile.c:184
 msgid "writing to stdout\n"
 msgstr "skriver til stdout\n"
 
-#: g10/openfile.c:261
+#: g10/openfile.c:273
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr ""
 
-#: g10/openfile.c:311
+#: g10/openfile.c:323
 #, c-format
 msgid "%s: new options file created\n"
 msgstr ""
 
-#: g10/openfile.c:338
+#: g10/openfile.c:350
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: g10/openfile.c:341
+#: g10/openfile.c:353
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: mappe oprettet\n"
 
-#: g10/openfile.c:343
+#: g10/openfile.c:355
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 
@@ -3335,6 +3419,10 @@
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 
+#: g10/encr-data.c:97
+msgid "problem handling encrypted packet\n"
+msgstr ""
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr ""
@@ -3344,14 +3432,6 @@
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr ""
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr ""
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr ""
@@ -3364,6 +3444,14 @@
 msgid "This is a secret key! - really delete? "
 msgstr ""
 
+#: g10/delkey.c:181
+msgid "there is a secret key for this public key!\n"
+msgstr ""
+
+#: g10/delkey.c:183
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr ""
+
 #: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
@@ -3555,6 +3643,19 @@
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Ingen hjælp tilgængelig for `%s'"
+
+#, fuzzy
+#~ msgid "invalid"
+#~ msgstr "ugyldig rustning"
+
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "RSA nøgle kan ikke bruges i denne version\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Ingen nøgle for bruger-ID\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Ingen bruger-ID for nøgle\n"
 
 #~ msgid "set debugging flags"
 #~ msgstr "sæt aflusningsflag"
diff -urN gnupg-1.0.4/po/de.po gnupg-1.0.5/po/de.po
--- gnupg-1.0.4/po/de.po	Tue Oct 17 15:40:35 2000
+++ gnupg-1.0.5/po/de.po	Sun Apr 29 16:39:22 2001
@@ -1,11 +1,11 @@
 # GnuPG german translation
-# Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
-# Walter Koch <koch@hsp.de>, 1998, 1999, 2000
+# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+# Walter Koch <koch@hsp.de>, 1998, 1999, 2000, 2001
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-10-16 19:22+0200\n"
-"PO-Revision-Date: 2000-10-15 14:30+0200\n"
+"Project-Id-Version: gnupg-1.0.4\n"
+"POT-Creation-Date: 2001-04-29 16:39+0200\n"
+"PO-Revision-Date: 2001-04-16 14:20+0200\n"
 "Last-Translator: Walter Koch <koch@hsp.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,36 +18,36 @@
 
 # "  Um dies zu vermeiden, kann das Programm suid(root) installiert werden.\n"
 # "  Bitte wenden Sie sich hierzu an den Systemadministrator.\n"
-#: util/secmem.c:295
+#: util/secmem.c:299
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "Vorgang ist ohne sicheren Hauptspeicher nicht möglich\n"
 
-#: util/secmem.c:296
+#: util/secmem.c:300
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 "(möglicherweise haben Sie das falsche Programm für diese Aufgabe benutzt)\n"
 
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:287 util/miscutil.c:316
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:288 util/miscutil.c:319
 msgid "yY"
 msgstr "jJyY"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:289 util/miscutil.c:317
 msgid "no"
 msgstr "nein"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:290 util/miscutil.c:320
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:318
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:321
 msgid "qQ"
 msgstr "qQ"
 
@@ -247,6 +247,15 @@
 msgid "not processed"
 msgstr "nicht bearbeitet"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+msgid "unusable public key"
+msgstr "unbrauchbarer öffentlicher Schüssel"
+
+#: util/errors.c:106
+msgid "unusable secret key"
+msgstr "unbrauchbarer geheimer Schlüssel"
+
 #: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -257,64 +266,64 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:324
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "Status von '%s' ist nicht feststellbar: %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:329
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' ist keine normale Datei - sie bleibt unbeachtet\n"
 
-#: cipher/random.c:325
+#: cipher/random.c:334
 msgid "note: random_seed file is empty\n"
 msgstr "Hinweis: 'random_seed'-Datei ist leer\n"
 
-#: cipher/random.c:331
+#: cipher/random.c:340
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 "Warnung: Falsche Größe der 'random_seed'-Datei - sie wird nicht verwendet\n"
 
-#: cipher/random.c:339
+#: cipher/random.c:348
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "'%s' ist unlesbar: %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:386
 msgid "note: random_seed file not updated\n"
 msgstr "Hinweis: 'random_seed'-Datei bleibt unverändert\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:406
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:413
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kann '%s' nicht schreiben: %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:416
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kann '%s' nicht schliessen: %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:427
 #, c-format
 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:650
+#: cipher/random.c:661
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "WARNUNG: Der Zufallsgenerator erzeugt keine echten Zufallszahlen!\n"
 
-#: cipher/random.c:651
+#: cipher/random.c:662
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -340,7 +349,7 @@
 "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
 "(Es werden noch %d Byte benötigt.)\n"
 
-#: g10/g10.c:206
+#: g10/g10.c:216
 msgid ""
 "@Commands:\n"
 " "
@@ -348,139 +357,139 @@
 "@Befehle:\n"
 " "
 
-#: g10/g10.c:208
+#: g10/g10.c:218
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/g10.c:209
+#: g10/g10.c:219
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/g10.c:210
+#: g10/g10.c:220
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/g10.c:211
+#: g10/g10.c:221
 msgid "encrypt data"
 msgstr "Daten verschlüsseln"
 
-#: g10/g10.c:212
+#: g10/g10.c:222
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschlüsseln"
 
-#: g10/g10.c:213
+#: g10/g10.c:223
 msgid "store only"
 msgstr "Nur speichern"
 
-#: g10/g10.c:214
+#: g10/g10.c:224
 msgid "decrypt data (default)"
 msgstr "Daten entschlüsseln (Voreinstellung)"
 
-#: g10/g10.c:215
+#: g10/g10.c:225
 msgid "verify a signature"
 msgstr "Signatur prüfen"
 
-#: g10/g10.c:217
+#: g10/g10.c:227
 msgid "list keys"
 msgstr "Liste der Schlüssel"
 
-#: g10/g10.c:219
+#: g10/g10.c:229
 msgid "list keys and signatures"
 msgstr "Liste der Schlüssel und ihrer Signaturen"
 
-#: g10/g10.c:220
+#: g10/g10.c:230
 msgid "check key signatures"
 msgstr "Signaturen der Schlüssel prüfen"
 
-#: g10/g10.c:221
+#: g10/g10.c:231
 msgid "list keys and fingerprints"
 msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
 
-#: g10/g10.c:222
+#: g10/g10.c:232
 msgid "list secret keys"
 msgstr "Liste der geheimen Schlüssel"
 
-#: g10/g10.c:223
+#: g10/g10.c:233
 msgid "generate a new key pair"
 msgstr "Ein neues Schlüsselpaar erzeugen"
 
-#: g10/g10.c:224
+#: g10/g10.c:234
 msgid "remove key from the public keyring"
 msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen"
 
-#: g10/g10.c:226
+#: g10/g10.c:236
 msgid "remove key from the secret keyring"
 msgstr "Schlüssel aus dem geh. Schlüsselbund entfernen"
 
-#: g10/g10.c:227
+#: g10/g10.c:237
 msgid "sign a key"
 msgstr "Schlüssel signieren"
 
-#: g10/g10.c:228
+#: g10/g10.c:238
 msgid "sign a key locally"
 msgstr "Schlüssel nur auf diesem Rechner signieren"
 
-#: g10/g10.c:229
+#: g10/g10.c:239
 msgid "sign or edit a key"
 msgstr "Unterschreiben oder Bearbeiten eines Schl."
 
-#: g10/g10.c:230
+#: g10/g10.c:240
 msgid "generate a revocation certificate"
 msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
 
-#: g10/g10.c:231
+#: g10/g10.c:241
 msgid "export keys"
 msgstr "Schlüssel exportieren"
 
-#: g10/g10.c:232
+#: g10/g10.c:242
 msgid "export keys to a key server"
 msgstr "Schlüssel zu einem Schlü.server exportieren"
 
-#: g10/g10.c:233
+#: g10/g10.c:243
 msgid "import keys from a key server"
 msgstr "Schlüssel von einem Schlü.server importieren"
 
-#: g10/g10.c:237
+#: g10/g10.c:247
 msgid "import/merge keys"
 msgstr "Schlüssel importieren/kombinieren"
 
-#: g10/g10.c:239
+#: g10/g10.c:249
 msgid "list only the sequence of packets"
 msgstr "Lediglich Struktur der Datenpakete anzeigen"
 
-#: g10/g10.c:241
+#: g10/g10.c:251
 msgid "export the ownertrust values"
 msgstr "Exportieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:243
+#: g10/g10.c:253
 msgid "import ownertrust values"
 msgstr "Importieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:245
+#: g10/g10.c:255
 msgid "update the trust database"
 msgstr "Ändern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:247
+#: g10/g10.c:257
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMEN]|Überprüfen der \"Trust\"-Datenbank"
 
-#: g10/g10.c:248
+#: g10/g10.c:258
 msgid "fix a corrupted trust database"
 msgstr "Reparieren einer beschädigten \"Trust\"-Datenb."
 
-#: g10/g10.c:249
+#: g10/g10.c:259
 msgid "De-Armor a file or stdin"
 msgstr "Datei oder stdin von der ASCII-Hülle befreien"
 
-#: g10/g10.c:251
+#: g10/g10.c:261
 msgid "En-Armor a file or stdin"
 msgstr "Datei oder stdin in eine ASCII-Hülle einpacken"
 
-#: g10/g10.c:253
+#: g10/g10.c:263
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests für die Dateien ausgeben"
 
-#: g10/g10.c:257
+#: g10/g10.c:267
 msgid ""
 "@\n"
 "Options:\n"
@@ -490,156 +499,160 @@
 "Optionen:\n"
 " "
 
-#: g10/g10.c:259
+#: g10/g10.c:269
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-Hülle versehen"
 
-#: g10/g10.c:261
+#: g10/g10.c:271
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschlüsseln für NAME"
 
-#: g10/g10.c:264
+#: g10/g10.c:274
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|NAME als voreingestellten Empfänger benutzen"
 
-#: g10/g10.c:266
+#: g10/g10.c:276
 msgid "use the default key as default recipient"
 msgstr ""
 "Den Standardschlüssel als voreingestellten\n"
 "Empfänger benutzen"
 
-#: g10/g10.c:270
+#: g10/g10.c:280
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/g10.c:271
+#: g10/g10.c:281
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/g10.c:273
+#: g10/g10.c:283
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/g10.c:274
+#: g10/g10.c:284
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/g10.c:275
+#: g10/g10.c:285
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/g10.c:276
+#: g10/g10.c:286
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: g10/g10.c:277
+#: g10/g10.c:287
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: g10/g10.c:278
+#: g10/g10.c:288
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#: g10/g10.c:279
+#: g10/g10.c:289
 msgid "always use a MDC for encryption"
 msgstr "Beim Verschlüsseln ein Siegel (MDC) verwenden"
 
-#: g10/g10.c:280
+#: g10/g10.c:290
 msgid "do not make any changes"
 msgstr "Keine wirklichen Änderungen durchführen"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:282
+#: g10/g10.c:292
+msgid "use the gpg-agent"
+msgstr "verwende den GPG-Agent"
+
+#: g10/g10.c:293
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: g10/g10.c:283
+#: g10/g10.c:294
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: g10/g10.c:284
+#: g10/g10.c:295
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: g10/g10.c:285
+#: g10/g10.c:296
 msgid "add this keyring to the list of keyrings"
 msgstr "Als öffentlichen Schlüsselbund mitbenutzen"
 
-#: g10/g10.c:286
+#: g10/g10.c:297
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schlüsselbund mitbenutzen"
 
-#: g10/g10.c:287
+#: g10/g10.c:298
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen"
 
-#: g10/g10.c:288
+#: g10/g10.c:299
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|Schlüssel bei diesem Server nachschlagen"
 
-#: g10/g10.c:289
+#: g10/g10.c:300
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Terminalzeichensatz NAME benutzen"
 
-#: g10/g10.c:290
+#: g10/g10.c:301
 msgid "read options from file"
 msgstr "Optionen aus der Datei lesen"
 
-#: g10/g10.c:294
+#: g10/g10.c:305
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/g10.c:299
+#: g10/g10.c:310
 msgid "|KEYID|ulimately trust this key"
 msgstr "|KEYID|diesem Schlüssel uneingeschränkt vertrauen"
 
-#: g10/g10.c:300
+#: g10/g10.c:311
 msgid "|FILE|load extension module FILE"
 msgstr "|DATEI|Erweiterungsmodul DATEI laden"
 
-#: g10/g10.c:301
+#: g10/g10.c:312
 msgid "emulate the mode described in RFC1991"
 msgstr "Den in RFC1991 beschriebenen Modus nachahmen"
 
-#: g10/g10.c:302
+#: g10/g10.c:313
 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:303
+#: g10/g10.c:314
 msgid "|N|use passphrase mode N"
 msgstr "|N|Verwenden des Mantra-Modus N"
 
-#: g10/g10.c:305
+#: g10/g10.c:316
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|Hashverfahren NAME für Mantras benutzen"
 
-#: g10/g10.c:307
+#: g10/g10.c:318
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|Verschlü.verfahren NAME für Mantras benutzen"
 
-#: g10/g10.c:308
+#: g10/g10.c:319
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschlü.verfahren NAME benutzen"
 
-#: g10/g10.c:309
+#: g10/g10.c:320
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: g10/g10.c:310
+#: g10/g10.c:321
 msgid "|N|use compress algorithm N"
 msgstr "|N|Komprimierverfahren N benutzen"
 
-#: g10/g10.c:311
+#: g10/g10.c:322
 msgid "throw keyid field of encrypted packets"
 msgstr "Entferne Empfänger-ID verschlüsselter Pakete"
 
-#: g10/g10.c:312
+#: g10/g10.c:323
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=WERT|verwende diese \"notation\"-Daten"
 
-#: g10/g10.c:315
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -648,7 +661,7 @@
 "(Auf der \"man\"-Seite ist eine vollständige Liste aller Kommandos und "
 "Optionen)\n"
 
-#: g10/g10.c:318
+#: g10/g10.c:329
 msgid ""
 "@\n"
 "Examples:\n"
@@ -668,17 +681,17 @@
 " --list-keys [Namen]        Schlüssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdrücke\" anzeigen\n"
 
-#: g10/g10.c:418
+#: g10/g10.c:438
 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:422
+#: g10/g10.c:442
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h für Hilfe)"
 
-#: g10/g10.c:425
+#: g10/g10.c:445
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -688,7 +701,7 @@
 "Signieren, prüfen, verschlüsseln, entschlüsseln\n"
 "Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
 
-#: g10/g10.c:432
+#: g10/g10.c:452
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -696,188 +709,192 @@
 "\n"
 "Unterstützte Verfahren:\n"
 
-#: g10/g10.c:511
+#: g10/g10.c:531
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:564
+#: g10/g10.c:584
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Befehle\n"
 
-#: g10/g10.c:704
+#: g10/g10.c:734
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:708
+#: g10/g10.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:715
+#: g10/g10.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:905
+#: g10/g10.c:950
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ist kein gültiger Zeichensatz.\n"
 
-#: g10/g10.c:970
+#: g10/g10.c:1024
 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
+#: g10/g10.c:1028 g10/g10.c:1037
 #, 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:976
+#: g10/g10.c:1030
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/g10.c:979
+#: g10/g10.c:1033
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/g10.c:998 g10/g10.c:1010
+#: g10/g10.c:1053 g10/g10.c:1065
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsslungsverfahren ist ungültig\n"
 
-#: g10/g10.c:1004 g10/g10.c:1016
+#: g10/g10.c:1059 g10/g10.c:1071
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1075
 msgid "the given policy URL is invalid\n"
 msgstr "Die angegebene URL für Richtlinien ist ungültig\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1078
 #, 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:1025
+#: g10/g10.c:1080
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed müssen größer als 0 sein\n"
 
-#: g10/g10.c:1027
+#: g10/g10.c:1082
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed müssen größer als 1 sein\n"
 
-#: g10/g10.c:1029
+#: g10/g10.c:1084
 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:1032
+#: g10/g10.c:1087
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:1036
+#: g10/g10.c:1091
 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:1121
+#: g10/g10.c:1176
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:1127
+#: g10/g10.c:1182
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:1134
+#: g10/g10.c:1189
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:1142
+#: g10/g10.c:1197
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1210
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1223
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1237
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:1199
+#: g10/g10.c:1254
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1262
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1270
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1278
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/g10.c:1239
+#: g10/g10.c:1294
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key User-ID"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1297
 msgid "--delete-key user-id"
 msgstr "--delete-key User-ID"
 
-#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
+#: g10/g10.c:1305
+msgid "--delete-secret-and-public-key user-id"
+msgstr "--delete-secret-and-public-key User-ID"
+
+#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1357
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schlüsselbund]"
 
-#: g10/g10.c:1360
+#: g10/g10.c:1423
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1368
+#: g10/g10.c:1431
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1439
+#: g10/g10.c:1502
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:1520
+#: g10/g10.c:1589
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:1524
+#: g10/g10.c:1593
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht geöffnet werden\n"
 
-#: g10/g10.c:1737
+#: g10/g10.c:1805
 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:1743
+#: g10/g10.c:1811
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -885,88 +902,88 @@
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und muß mit einem '=' enden\n"
 
-#: g10/g10.c:1749
+#: g10/g10.c:1817
 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:1757
+#: g10/g10.c:1825
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
-#: g10/armor.c:302
+#: g10/armor.c:306
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII-Hülle: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:335
 msgid "invalid armor header: "
 msgstr "Ungültige ASCII-Hülle"
 
-#: g10/armor.c:338
+#: g10/armor.c:342
 msgid "armor header: "
 msgstr "ASCII-Hülle: "
 
-#: g10/armor.c:349
+#: g10/armor.c:353
 msgid "invalid clearsig header\n"
 msgstr "Ungültige Klartextsignatur-Einleitung\n"
 
-#: g10/armor.c:401
+#: g10/armor.c:405
 msgid "nested clear text signatures\n"
 msgstr "verschachtelte Klartextunterschriften\n"
 
-#: g10/armor.c:525
+#: g10/armor.c:529
 msgid "invalid dash escaped line: "
 msgstr "Ungültige mit Bindestrich \"escapte\" Zeile: "
 
-#: g10/armor.c:537
+#: g10/armor.c:541
 msgid "unexpected armor:"
 msgstr "Unerwartete ASCII-Hülle:"
 
-#: g10/armor.c:654
+#: g10/armor.c:667 g10/armor.c:1235
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Ungültiges \"radix64\" Zeichen %02x ignoriert\n"
 
-#: g10/armor.c:697
+#: g10/armor.c:710
 msgid "premature eof (no CRC)\n"
 msgstr "vorzeitiges Dateiende (keine Prüfsumme)\n"
 
-#: g10/armor.c:731
+#: g10/armor.c:744
 msgid "premature eof (in CRC)\n"
 msgstr "vorzeitiges Dateiende (innerhalb der Prüfsumme)\n"
 
-#: g10/armor.c:735
+#: g10/armor.c:748
 msgid "malformed CRC\n"
 msgstr "Falsch aufgebaute Prüfsumme\n"
 
-#: g10/armor.c:739
+#: g10/armor.c:752 g10/armor.c:1272
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "Prüfsummenfehler; %06lx - %06lx\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:772
 msgid "premature eof (in Trailer)\n"
 msgstr "vorzeitiges Dateiende (im Nachsatz)\n"
 
-#: g10/armor.c:760
+#: g10/armor.c:776
 msgid "error in trailer line\n"
 msgstr "Fehler in der Nachsatzzeile\n"
 
-#: g10/armor.c:906
+#: g10/armor.c:922
 msgid "For info see http://www.gnupg.org"
 msgstr "Weitere Infos: siehe http://www.gnupg.org"
 
-#: g10/armor.c:1027
+#: g10/armor.c:1050
 msgid "no valid OpenPGP data found.\n"
 msgstr "Keine gültigen OpenPGP-Daten gefunden.\n"
 
-#: g10/armor.c:1032
+#: g10/armor.c:1055
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ungültige ASCII-Hülle: Zeile ist länger als %d Zeichen\n"
 
-#: g10/armor.c:1036
+#: g10/armor.c:1059
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -975,7 +992,7 @@
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "           Fingerabdruck:"
 
@@ -1081,7 +1098,7 @@
 "No path leading to one of our keys found.\n"
 "\n"
 msgstr ""
-"Kein Pfad führt zu einen unserer Schlüsseln.\n"
+"Kein Pfad führt zu einem unserer Schlüsseln.\n"
 "\n"
 
 #: g10/pkclist.c:437
@@ -1089,7 +1106,7 @@
 "No certificates with undefined trust found.\n"
 "\n"
 msgstr ""
-"Keine Zertifikate mit undefinierten Vertrauen gefunden.\n"
+"Keine Zertifikate mit undefiniertem Vertrauen gefunden.\n"
 "\n"
 
 #: g10/pkclist.c:439
@@ -1214,62 +1231,62 @@
 "         Es ist nicht sicher, daß die Signatur wirklich dem vorgeblichen "
 "Besitzer gehört.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: übersprungen: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: übersprungen: öffentlicher Schlüssel bereits vorhanden\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
 msgstr ""
-"Sie gaben keine User-ID angegeben (Benutzen Sie die Option \"-r\").\n"
+"Sie haben keine User-ID angegeben (Benutzen Sie die Option \"-r\").\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "Geben Sie die User-ID ein: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "Keine solche User-ID vorhanden.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "übersprungen: öffentlicher Schlüssel bereits als Standardempfänger gesetzt\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
 msgstr "Öffentlicher Schlüssel ist abgeschaltet.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr ""
 "übersprungen: öffentlicher Schlüssel bereits mittels --encrypt-to gesetzt\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "Unbekannter voreingestellter Empfänger '%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: Fehler beim Prüfen des Schlüssels: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: übersprungen: öffentlicher Schlüssel ist abgeschaltet\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "Keine gültigen Adressaten\n"
 
@@ -1277,64 +1294,69 @@
 msgid "writing self signature\n"
 msgstr "Die Eigenbeglaubigung wird geschrieben\n"
 
-#: g10/keygen.c:214
+#: g10/keygen.c:217
 msgid "writing key binding signature\n"
 msgstr "Schreiben der \"key-binding\" Signatur\n"
 
-#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
+#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ungültig Schlüssellänge; %u Bit werden verwendet\n"
 
-#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
+#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Schlüssellänge auf %u Bit aufgerundet\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:549
 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:542
+#: g10/keygen.c:551
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA und ElGamal (voreingestellt)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:552
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:554
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur verschlüsseln)\n"
 
-#: g10/keygen.c:546
+#: g10/keygen.c:555
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signieren/beglaubigen und verschlüsseln)\n"
 
-#: g10/keygen.c:548
+#: g10/keygen.c:557
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (signieren/beglaubigen und verschlüsseln)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:561
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
-#: g10/keygen.c:563 g10/keygen.c:571
+#: g10/keygen.c:572
 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:585
+#: g10/keygen.c:580
+msgid "The use of this algorithm is deprecated - create anyway? "
+msgstr ""
+"Von der Benutzung dieses Verfahrens ist abzuraten - Trotzdem erzeugen? "
+
+#: g10/keygen.c:594
 msgid "Invalid selection.\n"
 msgstr "Ungültige Auswahl.\n"
 
-#: g10/keygen.c:597
+#: g10/keygen.c:606
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1347,19 +1369,19 @@
 "              standard Schlüssellänge ist 1024 Bit\n"
 "      größte sinnvolle Schlüssellänge ist 2048 Bit\n"
 
-#: g10/keygen.c:604
+#: g10/keygen.c:613
 msgid "What keysize do you want? (1024) "
 msgstr "Welche Schlüssellänge wünschen Sie? (1024) "
 
-#: g10/keygen.c:609
+#: g10/keygen.c:618
 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:611
+#: g10/keygen.c:620
 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:613
+#: g10/keygen.c:622
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "zu kurz; 1024 ist die kleinste für RSA mögliche Schlüssellänge.\n"
 
@@ -1371,12 +1393,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:624
+#: g10/keygen.c:633
 #, 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:629
+#: g10/keygen.c:638
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1384,11 +1406,11 @@
 "Schlüssellängen größer als 2048 werden nicht empfohlen, da die\n"
 "Berechnungen dann WIRKLICH lange brauchen!\n"
 
-#: g10/keygen.c:632
+#: g10/keygen.c:641
 msgid "Are you sure that you want this keysize? "
 msgstr "Sind Sie sicher, daß Sie diese Schlüssellänge wünschen? "
 
-#: g10/keygen.c:633
+#: g10/keygen.c:642
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1396,21 +1418,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:641
+#: g10/keygen.c:650
 msgid "Do you really need such a large keysize? "
 msgstr "Brauchen Sie wirklich einen derartig langen Schlüssel? "
 
-#: g10/keygen.c:647
+#: g10/keygen.c:656
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Die verlangte Schlüssellänge beträgt %u Bit\n"
 
-#: g10/keygen.c:650 g10/keygen.c:654
+#: g10/keygen.c:659 g10/keygen.c:663
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/keygen.c:702
+#: g10/keygen.c:711
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1426,25 +1448,25 @@
 "      <n>m = Schlüssel verfällt nach n Monaten\n"
 "      <n>y = Schlüssel verfällt nach n Jahren\n"
 
-#: g10/keygen.c:717
+#: g10/keygen.c:726
 msgid "Key is valid for? (0) "
 msgstr "Der Schlüssel bleibt wie lange gültig? (0) "
 
-#: g10/keygen.c:722
+#: g10/keygen.c:731
 msgid "invalid value\n"
 msgstr "Ungültiger Wert.\n"
 
-#: g10/keygen.c:727
+#: g10/keygen.c:736
 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:733
+#: g10/keygen.c:742
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Der Schlüssel verfällt am %s\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:745
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1452,11 +1474,11 @@
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:741
+#: g10/keygen.c:750
 msgid "Is this correct (y/n)? "
 msgstr "Ist dies richtig? (j/n) "
 
-#: g10/keygen.c:784
+#: g10/keygen.c:793
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1472,44 +1494,44 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:796
+#: g10/keygen.c:805
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:804
+#: g10/keygen.c:813
 msgid "Invalid character in name\n"
 msgstr "Ungültiges Zeichen im Namen\n"
 
-#: g10/keygen.c:806
+#: g10/keygen.c:815
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:808
+#: g10/keygen.c:817
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name muß min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:816
+#: g10/keygen.c:825
 msgid "Email address: "
 msgstr "E-Mail-Adresse: "
 
-#: g10/keygen.c:827
+#: g10/keygen.c:836
 msgid "Not a valid email address\n"
 msgstr "Diese E-Mail-Adresse ist ungültig\n"
 
-#: g10/keygen.c:835
+#: g10/keygen.c:844
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:841
+#: g10/keygen.c:850
 msgid "Invalid character in comment\n"
 msgstr "Ungültiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:864
+#: g10/keygen.c:873
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:870
+#: g10/keygen.c:879
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1520,27 +1542,27 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:883
 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:879
+#: g10/keygen.c:888
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:889
+#: g10/keygen.c:898
 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:890
+#: g10/keygen.c:899
 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:909
+#: g10/keygen.c:918
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:947
+#: g10/keygen.c:956
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1548,11 +1570,11 @@
 "Sie benötigen ein Mantra, um den geheimen Schlüssel zu schützen.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:964
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen.\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:970
 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"
@@ -1565,7 +1587,7 @@
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:982
+#: g10/keygen.c:991
 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 +1598,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:1431
+#: g10/keygen.c:1440
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Der DSA Schlüssel wird 1024 Bit haben.\n"
 
-#: g10/keygen.c:1474
+#: g10/keygen.c:1483
 msgid "Key generation canceled.\n"
 msgstr "Schlüsselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1581
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1582
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "schreiben des geheimen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1679
 msgid "public and secret key created and signed.\n"
 msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1684
 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,12 +1629,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:1690 g10/keygen.c:1791
+#: g10/keygen.c:1701 g10/keygen.c:1807
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1748 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"
@@ -1620,7 +1642,7 @@
 "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht überein)\n"
 
-#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1750 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"
@@ -1628,11 +1650,11 @@
 "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht überein)\n"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1783
 msgid "Really create? "
 msgstr "Wirklich erzeugen? "
 
-#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1643,17 +1665,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen des Mantras: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: WARNUNG: Leere Datei\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Lesen von '%s'\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s verschlüsselt für: %s\n"
@@ -1678,285 +1700,289 @@
 msgid "key %08lX: not protected - skipped\n"
 msgstr "Schlüssel %08lX: ungeschützt - übersprungen\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr "WARNUNG: Nichts exportiert\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:214
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zu viele Einträge im pk-Lager - abgeschaltet\n"
 
-#: g10/getkey.c:350
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+msgid "[User id not found]"
+msgstr "[User-ID nicht gefunden]"
+
+#: g10/getkey.c:453
 msgid "too many entries in unk cache - disabled\n"
 msgstr "zu viele Einträge im unk-Lager - abgeschaltet\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr "RSA-Schlüssel können in dieser Version nicht verwendet werden\n"
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
-msgstr "Kein Schlüssel für User-ID\n"
-
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
-msgstr "Keine User-ID für Schlüssel\n"
-
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2207
 #, 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:2050
-msgid "[User id not found]"
-msgstr "[User-ID nicht gefunden]"
+#: g10/getkey.c:2249 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/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "überspringe den Block vom Typ %d\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 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:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Anzahl insgesamt bearbeiteter Schlüssel: %lu\n"
 
-#: g10/import.c:206
+#: g10/import.c:208
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "              ignorierte neue Schlüssel: %lu\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                           ohne User-ID: %lu\n"
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr "                             importiert: %lu"
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                            unverändert: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "                          neue User-IDs: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                    neue Unterschlüssel: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                        neue Signaturen: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "                neue Schlüsselwiderrufe: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "             gelesene geheime Schlüssel: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "           geheime Schlüssel importiert: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "                 unveränderte geh.Schl.: %lu\n"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "Schlüssel %08lX: Keine User-ID\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "Schlüssel %08lX: Keine gültigen User-IDs\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 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:418 g10/import.c:657
+#: g10/import.c:435 g10/import.c:684
 #, 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:423
+#: g10/import.c:440
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "Schlüssel %08lX: neuer Schlüssel - übersprungen\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "Kein voreingestellter öffentlicher Schlüsselbund\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "kann Schlüsselbund `%s' nicht sperren: %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des Schlüsselbundes `%s': %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "Schlüssel %08lX: Öffentlicher Schlüssel importiert\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, 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:472 g10/import.c:665
+#: g10/import.c:489 g10/import.c:692
 #, 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:478 g10/import.c:671
+#: g10/import.c:495 g10/import.c:698
 #, 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:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "Schlüssel %08lX: 1 neue User-ID\n"
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "Schlüssel %08lX: %d neue User-IDs\n"
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "Schlüssel %08lX: 1 neue Signatur\n"
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "Schlüssel %08lX: %d neue Signaturen\n"
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "Schlüssel %08lX: 1 neuer Unterschlüssel\n"
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "Schlüssel %08lX: %d neue Unterschlüssel\n"
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "Schlüssel %08lX: Nicht geändert\n"
 
-#: g10/import.c:613
+#: g10/import.c:610
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+"Geheimer Schlüssel %08lX nicht importiert (%s verwenden, um das zu "
+"ermöglichen)\n"
+
+#: g10/import.c:640
 #, 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:617
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "Schlüssel %08lX: Ist bereits im geheimen Schlüsselbund\n"
 
-#: g10/import.c:622
+#: g10/import.c:649
 #, 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:651
+#: g10/import.c:678
 #, 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:682
+#: g10/import.c:709
 #, 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:714
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "Schlüssel %08lX: Widerrufzertifikat importiert\n"
 
-#: g10/import.c:756
+#: g10/import.c:783
 #, 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:763 g10/import.c:787
+#: g10/import.c:790 g10/import.c:814
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "Schlüssel %08lX: Nicht unterstütztes Public-Key-Verfahren\n"
 
-#: g10/import.c:764
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "Schlüssel %08lX: Ungültige Eigenbeglaubigung\n"
 
-#: g10/import.c:779
+#: g10/import.c:806
 #, 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:788
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "Schlüssel %08lX: Ungültige Unterschlüssel-Anbindung\n"
 
-#: g10/import.c:815
+#: g10/import.c:842
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "Schlüssel %08lX: Nicht eigenbeglaubigte User-ID übernommen'"
 
-#: g10/import.c:844
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "Schlüssel %08lX: User-ID übergangen '"
 
-#: g10/import.c:867
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "Schlüssel %08lX: Unterschlüssel ignoriert\n"
@@ -1965,99 +1991,99 @@
 #. * 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:892
+#: g10/import.c:919
 #, 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:901
+#: g10/import.c:928
 #, 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:909
+#: g10/import.c:936
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "Schlüssel %08lX: Ungültiges Widerrufzertifikat: %s - übergangen\n"
 
-#: g10/import.c:1009
+#: g10/import.c:1036
 #, 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:1060
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "Schlüssel %08lX: Widerrufzertifikat hinzugefügt\n"
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "Schlüssel %08lX: Unsere Kopie hat keine Eigenbeglaubigung\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: Benutzer nicht gefunden\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr "[Widerruf]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr "[Eigenbeglaubigung]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
 msgstr "1 falsche Beglaubigung\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d falsche Beglaubigungen\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 Beglaubigung wegen fehlendem Schlüssel nicht geprüft\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d Beglaubigungen wegen fehlenden Schlüsseln nicht geprüft\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
 msgstr "1 Beglaubigung aufgrund von Fehler nicht geprüft\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d Beglaubigungen aufgrund von Fehlern nicht geprüft\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Eine User-ID ohne gültige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d User-IDs ohne gültige Eigenbeglaubigung entdeckt\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Ist bereits durch Schlüssel %08lX beglaubigt.\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nichts zu beglaubigen für Schlüssel %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2065,7 +2091,7 @@
 "Sind Sie wirklich sicher, daß Sie vorstehenden Schlüssel mit Ihrem\n"
 "Schlüssel beglaubigen wollen: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2073,33 +2099,33 @@
 "Die Unterschrift wird als nicht exportfähig markiert werden.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "Wirklich unterschreiben? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "Dieser Schlüssel ist nicht geschützt.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:432
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime Teile des Haupschlüssels sind nicht vorhanden\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "Schlüssel ist geschützt.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Dieser Schlüssel kann nicht editiert werden: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2107,7 +2133,7 @@
 "Geben Sie das neue Mantra für diesen geheimen Schlüssel ein.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2115,420 +2141,425 @@
 "Sie wollen kein Mantra - dies ist bestimmt *keine* gute Idee!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "Möchten Sie dies wirklich tun? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "Menü verlassen"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "speichern und Menü verlassen"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr "\"Fingerabdruck\" anzeigen"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr "Liste der Schlüssel"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
 msgstr "Schlüssel und User-IDs auflisten"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
 msgstr "User-ID N auswählen"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "Zweitschlüssel N auswählen"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr "Liste der Signaturen"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr "Den Schlüssel signieren"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
 msgstr "Den Schlüssel nur auf diesem Rechner signieren"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
 msgstr "Eine User-ID hinzufügen"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
 msgstr "User-ID entfernen"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr "Einen Zweitschlüssel hinzufügen"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "Einen Zweitschlüssel entfernen"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
 msgstr "Signatur entfernen"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr "Ändern des Verfallsdatums"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "Umschalten zwischen Anzeige geheimer und öffentlicher Schlüssel"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606 g10/keyedit.c:607
 msgid "list preferences"
 msgstr "Liste der Voreinstellungen"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "pref"
+
+#: g10/keyedit.c:608
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:608
 msgid "change the passphrase"
 msgstr "Das Mantra ändern"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "change the ownertrust"
 msgstr "Den \"Owner trust\" ändern"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revoke signatures"
 msgstr "Signaturen widerrufen"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revoke a secondary key"
 msgstr "Einen Zweitschlüssel widerrufen"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable a key"
 msgstr "Schlüssel abschalten"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable a key"
 msgstr "Schlüssel anschalten"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:633
 msgid "can't do that in batchmode\n"
 msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:669
+#: g10/keyedit.c:671
 msgid "Secret key is available.\n"
 msgstr "Geheimer Schlüssel ist vorhanden.\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:700
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 msgid "Need the secret key to do this.\n"
 msgstr "Hierzu wird der geheime Schlüssel benötigt.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bitte verwenden sie zunächst den Befehl \"toggle\"\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:781
 msgid "Really sign all user IDs? "
 msgstr "Wirklich alle User-IDs beglaubigen? "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:782
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tip: Wählen Sie die User-IDs, die beglaubigt werden sollen\n"
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:814 g10/keyedit.c:1000
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "Änderung der \"Trust-DB\" fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:825 g10/keyedit.c:846
 msgid "You must select at least one user ID.\n"
 msgstr "Zumindestens eine User-ID muß ausgewählt werden.\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:827
 msgid "You can't delete the last user ID!\n"
 msgstr "Die letzte User-ID kann nicht gelöscht werden!\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:830
 msgid "Really remove all selected user IDs? "
 msgstr "Möchten Sie alle ausgewählten User-IDs wirklich entfernen? "
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:831
 msgid "Really remove this user ID? "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:867 g10/keyedit.c:889
 msgid "You must select at least one key.\n"
 msgstr "Zumindestens ein Schlüssel muß ausgewählt werden.\n"
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:871
 msgid "Do you really want to delete the selected keys? "
 msgstr "Möchten Sie die ausgewählten Schlüssel wirklich entfernen? "
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:872
 msgid "Do you really want to delete this key? "
 msgstr "Möchten Sie diesen Schlüssel wirklich entfernen? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Möchten Sie die ausgewählten Schlüssel wirklich widerrufen? "
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:894
 msgid "Do you really want to revoke this key? "
 msgstr "Möchten Sie diesen Schlüssel wirklich wiederrufen? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
 msgid "Save changes? "
 msgstr "Änderungen speichern? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:967
 msgid "Quit without saving? "
 msgstr "Beenden ohne zu speichern? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:978
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Änderung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:985
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "Änderung des Geheimnisses fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:992
 msgid "Key not changed so no update needed.\n"
 msgstr "Schlüssel ist nicht geändert worden, also ist kein Speichern nötig.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1007
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  erstellt: %s verfällt: %s"
 
-#: g10/keyedit.c:1090
+#: g10/keyedit.c:1140
 #, c-format
 msgid " trust: %c/%c"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1144
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet"
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1173
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! Unterschlüssel wurde widerrufen: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1176
 msgid "rev- faked revocation found\n"
 msgstr "rev- gefälschter Schlüsselwiderruf entdeckt\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1178
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? Schwierigkeiten bei der Widerruf-Überprüfung: %s\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1420
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1424
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1428
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1434
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1448
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1449
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1452
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schlüsseln.\n"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1527
 msgid "Please select at most one secondary key.\n"
 msgstr "Bitte wählen Sie höchstens einen Zweitschlüssel aus.\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1531
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Ändern des Verfallsdatums des Zweitschlüssels.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1575
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Sie können das Verfallsdatum eines v3-Schlüssels nicht ändern\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1591
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schlüsselbund\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1652
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1698
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Kein Zweitschlüssel mit Index %d\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1796
 msgid "user ID: \""
 msgstr "User-ID: \""
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1799
 #, c-format
 msgid ""
 "\"\n"
@@ -2537,188 +2568,237 @@
 "\"\n"
 "unterschrieben mit Ihrem Schlüssel %08lX um %s\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1803
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Ein Widerrufszertifikat für diese Unterschrift erzeugen (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1827
 msgid "You have signed these user IDs:\n"
 msgstr "Sie haben folgende User-IDs beglaubigt:\n"
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   beglaubigt durch %08lX um %s\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1846
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   widerrufen durch %08lX um %s\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1866
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1884
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1913
 msgid "no secret key\n"
 msgstr "Kein geheimer Schlüssel\n"
 
-#: g10/keylist.c:158
-msgid "invalid"
-msgstr "ungültig"
-
-#: g10/keylist.c:178
-msgid "revoked"
-msgstr "widerrufen"
-
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:790
+#: g10/keylist.c:279 g10/mainproc.c:851
 #, c-format
 msgid " [expires: %s]"
 msgstr " [verfällt: %s]"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:269
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "Öffentlicher Schlüssel ist %08lX\n"
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:314
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit öffentlichem Schüssel verschlüsselte Daten: Korrekte DEK\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:366
 #, 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:336
+#: g10/mainproc.c:376
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "verschlüsselt mit %s Schlüssel, ID %08lX\n"
 
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr "kein geheimer Schlüssel zur Entschlüsselung vorhanden\n"
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:390
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschlüsselung mit öffentlichem Schlüssel fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:430
 msgid "decryption okay\n"
 msgstr "Enschlüsselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:435
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Warnung: Verschlüsselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:440
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Enschlüsselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:459
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:461
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Ursprünglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:632
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n"
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:719 g10/mainproc.c:728
 msgid "WARNING: invalid notation data found\n"
 msgstr "WARNUNG: Ungültige \"Notation\"-Daten gefunden\n"
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:731
 msgid "Notation: "
 msgstr "\"Notation\": "
 
-#: g10/mainproc.c:680
+#: g10/mainproc.c:740
 msgid "Policy: "
 msgstr "Richtlinie: "
 
-#: g10/mainproc.c:1121
+#: g10/mainproc.c:1193
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-Überprüfung unterdrückt\n"
 
+#. plaintext before signatures but no one-pass packets
+#: g10/mainproc.c:1235 g10/mainproc.c:1245
+msgid "can't handle these multiple signatures\n"
+msgstr "diese Mehrfachunterschriften können nicht behandelt werden\n"
+
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
-#: g10/mainproc.c:1158
+#: g10/mainproc.c:1256
 #, 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:1184 g10/mainproc.c:1195
+#: g10/mainproc.c:1284 g10/mainproc.c:1292
 msgid "BAD signature from \""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1196
+#: g10/mainproc.c:1285 g10/mainproc.c:1293
 msgid "Good signature from \""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr "                    alias \""
 
-#: g10/mainproc.c:1243
+#: g10/mainproc.c:1358
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht geprüft werden: %s\n"
 
-#: g10/mainproc.c:1318
+#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+msgid "not a detached signature\n"
+msgstr "keine abgetrennte Unterschrift\n"
+
+#: g10/mainproc.c:1454
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1511
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1518
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ungültiges root-Paket in proc_tree() entdeckt\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "core-dump-Dateierzeugung kann nicht abgeschaltet werden: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Experimentiermethoden sollten nicht benutzt werden!\n"
 
-#: g10/misc.c:234
-msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
-msgstr ""
-"Diese Verschlüsselungsmethode taugt nicht mehr viel; verwenden Sie eine "
-"stärker standardisierte Methode!\n"
+#: g10/misc.c:238
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+msgstr "Es ist davon abzuraten, diese Verschlüsselungsmethode zu benutzen!\n"
 
 #: g10/parse-packet.c:119
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
 
-#: g10/parse-packet.c:991
+#: g10/parse-packet.c:1010
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
 
-#: g10/passphrase.c:159
+#: g10/passphrase.c:223
+msgid "gpg-agent is not available in this session\n"
+msgstr "GPG-Agent ist in dieser Sitzung nicht vorhanden\n"
+
+#: g10/passphrase.c:229
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
+
+#: g10/hkp.c:167 g10/passphrase.c:248
+#, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
+
+#: g10/passphrase.c:313 g10/passphrase.c:576
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr " (Hauptschlüssel-ID %08lX)"
+
+#: g10/passphrase.c:323
+#, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"Sie benötigen ein Mantra, um den geheimen Schlüssel zu entsperren.\n"
+"Benutzer: \"\"%.*s\"\n"
+"%u-bit %s Schlüssel, ID %08lX, erzeugt %s%s\n"
+
+#: g10/passphrase.c:344
+msgid "Enter passphrase\n"
+msgstr "Geben Sie das Mantra ein\n"
+
+#: g10/passphrase.c:346
+msgid "Repeat passphrase\n"
+msgstr "Geben Sie das Mantra nochmal ein\n"
+
+#: g10/passphrase.c:384
+msgid "passphrase too long\n"
+msgstr "Mantra ist zu lang\n"
+
+#: g10/passphrase.c:396
+msgid "invalid response from agent\n"
+msgstr "Falsche Antwort des Agenten\n"
+
+#: g10/passphrase.c:405
+msgid "cancelled by user\n"
+msgstr "Abbruch durch Benutzer\n"
+
+#: g10/passphrase.c:408 g10/passphrase.c:477
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr "Schwierigkeiten mit dem Agenten: Agent antwortet 0x%lx\n"
+
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2728,25 +2808,20 @@
 "Sie benötigen ein Mantra, um den geheimen Schlüssel zu entsperren.\n"
 "Benutzer: \""
 
-#: g10/passphrase.c:168
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-Bit %s Schlüssel, ID %08lX, erzeugt %s"
 
-#: g10/passphrase.c:173
-#, c-format
-msgid " (main key ID %08lX)"
-msgstr " (Hauptschlüssel-ID %08lX)"
-
-#: g10/passphrase.c:190
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
 msgstr "Mantra kann im Batchmodus nicht abgefragt werden\n"
 
-#: g10/passphrase.c:194
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr "Geben Sie das Mantra ein: "
 
-#: g10/passphrase.c:198
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr "Geben Sie das Mantra nochmal ein: "
 
@@ -2755,19 +2830,23 @@
 msgstr ""
 "Daten wurden nicht gespeichert; verwenden Sie dafür die Option \"--output\"\n"
 
-#: g10/plaintext.c:324
+#: g10/plaintext.c:332
 msgid "Detached signature.\n"
 msgstr "Abgetrennte Beglaubigungen.\n"
 
-#: g10/plaintext.c:328
+#: g10/plaintext.c:336
 msgid "Please enter name of data file: "
 msgstr "Bitte geben Sie den Namen der Datendatei ein: "
 
-#: g10/plaintext.c:349
+#: g10/plaintext.c:357
 msgid "reading stdin ...\n"
 msgstr "lese stdin ...\n"
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:391
+msgid "no signed data\n"
+msgstr "keine unterschriebene Daten\n"
+
+#: g10/plaintext.c:399
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kann signierte Datei '%s' nicht öffnen.\n"
@@ -2800,41 +2879,36 @@
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "Hinweis: geheimer Schlüssel %08lX verfällt am %s\n"
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr "Schlüssel %08lX von %s wird angefordert ...\n"
 
-#: g10/hkp.c:85
+#: g10/hkp.c:83
 #, 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:109 g10/hkp.c:148
+#: g10/hkp.c:102 g10/hkp.c:136
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "Kein Schlüsselserver bekannt (Option --keyserver verwenden)\n"
 
-#: g10/hkp.c:117
+#: g10/hkp.c:110
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: Dies ist keine gültige Schlüssel-ID\n"
 
-#: 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:194
+#: g10/hkp.c:191
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "Fehler beim Senden an `%s': %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:203
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "Senden an `%s' erfolgreich (status=%u)\n"
 
-#: g10/hkp.c:209
+#: g10/hkp.c:206
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "Senden an `%s' erfolglos (status=%u)\n"
@@ -2883,31 +2957,36 @@
 msgstr ""
 "Öffentlicher Schlüssel ist um %lu Sekunden jünger als die Unterschrift\n"
 
-#: g10/sig-check.c:324
+#: g10/sig-check.c:328
 #, c-format
-msgid "NOTE: signature key expired %s\n"
-msgstr "Hinweis: Schlüssel der Signatur ist verfallen am %s.\n"
+msgid "NOTE: signature key %08lX expired %s\n"
+msgstr "Hinweis: Signaturschlüssel %08lX ist am %s verfallen.\n"
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "Vermutlich eine FALSCHE Unterschrift, wegen unbekanntem \"critical bit\"\n"
 
-#: g10/sign.c:140
+#: g10/sign.c:152
+#, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "Prüfung der erstellten Unterschrift ist fehlgeschlagen: %s\n"
+
+#: g10/sign.c:161
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s Unterschrift von: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:307 g10/sign.c:630
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s kann nicht erzeugt werden: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:405
 msgid "signing:"
 msgstr "unterschreibe:"
 
-#: g10/sign.c:431
+#: g10/sign.c:448
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
@@ -2946,7 +3025,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: Verzeichnis existiert nicht!\n"
 
-#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
+#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: kann nicht erzeugt werden: %s\n"
@@ -3122,7 +3201,7 @@
 #, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr ""
-"Schlüssel %08lX: kein öffentlicher Schlüssel für den vertrauenswürdig\ren "
+"Schlüssel %08lX: kein öffentlicher Schlüssel für den vertrauenswürdigen "
 "Schlüssel - übersprungen\n"
 
 #: g10/trustdb.c:565
@@ -3130,13 +3209,6 @@
 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"
@@ -3349,7 +3421,7 @@
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "WARNUNG: Lange 'Pref'-Records können noch nicht benutzt werden\n"
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -3359,7 +3431,7 @@
 "Denken Sie daran, daß die Datei mit der Unterschrift (.sig oder .asc)\n"
 "als erster in der Kommandozeile stehen sollte.\n"
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "Eingabezeile %u ist zu lang oder es fehlt ein LF\n"
@@ -3369,41 +3441,50 @@
 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:1374
+#: g10/ringedit.c:319 g10/ringedit.c:1376
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Schlüsselbund erstellt\n"
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1557
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "Warnung: Zwei Dateien mit vertraulichem Inhalt vorhanden.\n"
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1558
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ist der Unveränderte\n"
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1559
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ist der Neue\n"
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1560
 msgid "Please fix this possible security flaw\n"
 msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "Schlüssel ist nicht als unsicher gekennzeichnet - er ist nur mit einem\n"
 "echten Zufallsgenerator verwendbar\n"
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "übersprungen '%s': doppelt\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "übersprungen '%s': %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+msgid "skipped: secret key already present\n"
+msgstr "übersprungen: geheimer Schlüssel bereits vorhanden\n"
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3431,31 +3512,31 @@
 msgid "Enter new filename"
 msgstr "Neuen Dateinamen eingeben"
 
-#: g10/openfile.c:182
+#: g10/openfile.c:184
 msgid "writing to stdout\n"
 msgstr "Schreiben auf die Standardausgabe\n"
 
-#: g10/openfile.c:261
+#: g10/openfile.c:273
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "die unterzeichneten Daten sind wohl in '%s'\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:323
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: neue Optionendatei erstellt\n"
 
-#: g10/openfile.c:338
+#: g10/openfile.c:350
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: Verzeichnis kann nicht erzeugt werden: %s\n"
 
-#: g10/openfile.c:341
+#: g10/openfile.c:353
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: Verzeichnis erzeugt\n"
 
-#: g10/openfile.c:343
+#: g10/openfile.c:355
 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"
@@ -3476,6 +3557,10 @@
 msgstr ""
 "Warnung: Botschaft wurde mit einem unsicheren Schlüssel verschlüsselt.\n"
 
+#: g10/encr-data.c:97
+msgid "problem handling encrypted packet\n"
+msgstr "Problem beim Bearbeiten des verschlüsselten Pakets\n"
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "Unsicherer Schlüssel erzeugt - neuer Versuch\n"
@@ -3487,16 +3572,6 @@
 "Trotz %d-fachen Versuch konnte die Erzeugung eines unsicheren Schlüssels für "
 "sym.Verschlüsselung nicht vermieden werden!\n"
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "Es gibt einen privaten Schlüssel zu diesem öffentlichen Schlüssel!\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr ""
-"Benutzen Sie das Kommando \"--delete-secret-key\", um ihn vorab zu "
-"entfernen.\n"
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "Dies kann im Batchmodus ohne \"--yes\" nicht durchgeführt werden.\n"
@@ -3509,6 +3584,16 @@
 msgid "This is a secret key! - really delete? "
 msgstr "Dies ist ein privater Schlüssel! - Wirklich löschen? "
 
+#: g10/delkey.c:181
+msgid "there is a secret key for this public key!\n"
+msgstr "Es gibt einen privaten Schlüssel zu diesem öffentlichen Schlüssel!\n"
+
+#: g10/delkey.c:183
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr ""
+"Benutzen Sie das Kommando \"--delete-secret-key\", um ihn vorab zu "
+"entfernen.\n"
+
 #: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
@@ -3802,12 +3887,23 @@
 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 "invalid"
+#~ msgstr "ungültig"
+
+#~ msgid "revoked"
+#~ msgstr "widerrufen"
+
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "RSA-Schlüssel können in dieser Version nicht verwendet werden\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Kein Schlüssel für User-ID\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Keine User-ID für Schlüssel\n"
+
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "kein geheimer Schlüssel zur Entschlüsselung vorhanden\n"
 
 #~ msgid "   (%d) ElGamal in a v3 packet\n"
 #~ msgstr "   (%d) ElGamal in einem v3-Paket\n"
diff -urN gnupg-1.0.4/po/eo.po gnupg-1.0.5/po/eo.po
--- gnupg-1.0.4/po/eo.po	Tue Oct 17 15:40:36 2000
+++ gnupg-1.0.5/po/eo.po	Sun Apr 29 16:39:23 2001
@@ -1,12 +1,12 @@
 # Mesaøoj por la programo GnuPG
-# Copyright (C) 2000 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2000.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.0.1e\n"
-"POT-Creation-Date: 2000-10-16 19:22+0200\n"
-"PO-Revision-Date: 2000-08-16 23:19+01:00\n"
+"Project-Id-Version: gnupg 1.0.4\n"
+"POT-Creation-Date: 2001-04-29 16:39+0200\n"
+"PO-Revision-Date: 2001-04-23 20:55+01:00\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,35 +17,35 @@
 msgid "Warning: using insecure memory!\n"
 msgstr "Averto: uzas malsekuran memoron!\n"
 
-#: util/secmem.c:295
+#: util/secmem.c:299
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operacio ne eblas sen sekura memoro kun komenca valoro\n"
 
-#: util/secmem.c:296
+#: util/secmem.c:300
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(eble vi uzis la maløustan programon por æi tiu tasko)\n"
 
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:287 util/miscutil.c:316
 msgid "yes"
 msgstr "jes"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:288 util/miscutil.c:319
 msgid "yY"
 msgstr "jJ"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:289 util/miscutil.c:317
 msgid "no"
 msgstr "ne"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:290 util/miscutil.c:320
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:318
 msgid "quit"
 msgstr "fini"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:321
 msgid "qQ"
 msgstr "fF"
 
@@ -245,6 +245,17 @@
 msgid "not processed"
 msgstr "ne traktita"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "malbona publika þlosilo"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "malbona sekreta þlosilo"
+
 #: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -255,63 +266,63 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vi trovis cimon ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:324
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "ne povas stat-i '%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:329
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' ne estas normala dosiero - ignorita\n"
 
-#: cipher/random.c:325
+#: cipher/random.c:334
 msgid "note: random_seed file is empty\n"
 msgstr "noto: dosiero random_seed estas malplena\n"
 
-#: cipher/random.c:331
+#: cipher/random.c:340
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr "averto: nevalida grando de la dosiero random_seen - ne uzita\n"
 
-#: cipher/random.c:339
+#: cipher/random.c:348
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "ne povas legi '%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:386
 msgid "note: random_seed file not updated\n"
 msgstr "noto: dosiero random_seed ne aktualigita\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:406
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:413
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "ne povas skribi '%s': %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:416
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:427
 #, c-format
 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:650
+#: cipher/random.c:661
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVERTO: uzas malsekuran stokastilon!!\n"
 
-#: cipher/random.c:651
+#: cipher/random.c:662
 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 +347,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:206
+#: g10/g10.c:216
 msgid ""
 "@Commands:\n"
 " "
@@ -344,139 +355,139 @@
 "@Komandoj:\n"
 " "
 
-#: g10/g10.c:208
+#: g10/g10.c:218
 msgid "|[file]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: g10/g10.c:209
+#: g10/g10.c:219
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/g10.c:210
+#: g10/g10.c:220
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/g10.c:211
+#: g10/g10.c:221
 msgid "encrypt data"
 msgstr "æifri datenojn"
 
-#: g10/g10.c:212
+#: g10/g10.c:222
 msgid "encryption only with symmetric cipher"
 msgstr "æifri nur kun simetria æifro"
 
-#: g10/g10.c:213
+#: g10/g10.c:223
 msgid "store only"
 msgstr "nur skribi"
 
-#: g10/g10.c:214
+#: g10/g10.c:224
 msgid "decrypt data (default)"
 msgstr "malæifri datenojn (implicita elekto)"
 
-#: g10/g10.c:215
+#: g10/g10.c:225
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/g10.c:217
+#: g10/g10.c:227
 msgid "list keys"
 msgstr "listigi þlosilojn"
 
-#: g10/g10.c:219
+#: g10/g10.c:229
 msgid "list keys and signatures"
 msgstr "listigi þlosilojn kaj subskribojn"
 
-#: g10/g10.c:220
+#: g10/g10.c:230
 msgid "check key signatures"
 msgstr "kontroli þlosilsubskribojn"
 
-#: g10/g10.c:221
+#: g10/g10.c:231
 msgid "list keys and fingerprints"
 msgstr "listigi þlosilojn kaj fingroþpurojn"
 
-#: g10/g10.c:222
+#: g10/g10.c:232
 msgid "list secret keys"
 msgstr "listigi sekretajn þlosilojn"
 
-#: g10/g10.c:223
+#: g10/g10.c:233
 msgid "generate a new key pair"
 msgstr "krei novan þlosilparon"
 
-#: g10/g10.c:224
+#: g10/g10.c:234
 msgid "remove key from the public keyring"
 msgstr "forigi þlosilon de la publika þlosilaro"
 
-#: g10/g10.c:226
+#: g10/g10.c:236
 msgid "remove key from the secret keyring"
 msgstr "forigi þlosilon de la sekreta þlosilaro"
 
-#: g10/g10.c:227
+#: g10/g10.c:237
 msgid "sign a key"
 msgstr "subskribi þlosilon"
 
-#: g10/g10.c:228
+#: g10/g10.c:238
 msgid "sign a key locally"
 msgstr "subskribi þlosilon loke"
 
-#: g10/g10.c:229
+#: g10/g10.c:239
 msgid "sign or edit a key"
 msgstr "subskribi aý redakti þlosilon"
 
-#: g10/g10.c:230
+#: g10/g10.c:240
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/g10.c:231
+#: g10/g10.c:241
 msgid "export keys"
 msgstr "eksporti þlosilojn"
 
-#: g10/g10.c:232
+#: g10/g10.c:242
 msgid "export keys to a key server"
 msgstr "eksporti þlosilojn al þlosilservilo"
 
-#: g10/g10.c:233
+#: g10/g10.c:243
 msgid "import keys from a key server"
 msgstr "importi þlosilojn de þlosilservilo"
 
-#: g10/g10.c:237
+#: g10/g10.c:247
 msgid "import/merge keys"
 msgstr "importi/kunfandi þlosilojn"
 
-#: g10/g10.c:239
+#: g10/g10.c:249
 msgid "list only the sequence of packets"
 msgstr "listigi nur la sinsekvon de paketoj"
 
-#: g10/g10.c:241
+#: g10/g10.c:251
 msgid "export the ownertrust values"
 msgstr "eksporti la posedantofido-valorojn"
 
-#: g10/g10.c:243
+#: g10/g10.c:253
 msgid "import ownertrust values"
 msgstr "importi posedantofido-valorojn"
 
-#: g10/g10.c:245
+#: g10/g10.c:255
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/g10.c:247
+#: g10/g10.c:257
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMOJ]|kontroli la fido-datenaron"
 
-#: g10/g10.c:248
+#: g10/g10.c:258
 msgid "fix a corrupted trust database"
 msgstr "ripari fuþitan fido-datenaron"
 
-#: g10/g10.c:249
+#: g10/g10.c:259
 msgid "De-Armor a file or stdin"
 msgstr "elkirasigi dosieron aý la normalan enigon"
 
-#: g10/g10.c:251
+#: g10/g10.c:261
 msgid "En-Armor a file or stdin"
 msgstr "enkirasigi dosieron aý la normalan enigon"
 
-#: g10/g10.c:253
+#: g10/g10.c:263
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesaøo-kompendiojn"
 
-#: g10/g10.c:257
+#: g10/g10.c:267
 msgid ""
 "@\n"
 "Options:\n"
@@ -486,152 +497,156 @@
 "Opcioj:\n"
 " "
 
-#: g10/g10.c:259
+#: g10/g10.c:269
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/g10.c:261
+#: g10/g10.c:271
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|æifri por NOMO"
 
-#: g10/g10.c:264
+#: g10/g10.c:274
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: g10/g10.c:266
+#: g10/g10.c:276
 msgid "use the default key as default recipient"
 msgstr "uzi la implicitan þlosilon kiel implicitan ricevonton"
 
-#: g10/g10.c:270
+#: g10/g10.c:280
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi æi tiun uzantidentigilon por subskribi aý malæifri"
 
-#: g10/g10.c:271
+#: g10/g10.c:281
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/g10.c:273
+#: g10/g10.c:283
 msgid "use canonical text mode"
 msgstr "uzi tekstan reøimon"
 
-#: g10/g10.c:274
+#: g10/g10.c:284
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/g10.c:275
+#: g10/g10.c:285
 msgid "verbose"
 msgstr "detala eligo"
 
-#: g10/g10.c:276
+#: g10/g10.c:286
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: g10/g10.c:277
+#: g10/g10.c:287
 msgid "don't use the terminal at all"
 msgstr "tute ne uzi la terminalon"
 
-#: g10/g10.c:278
+#: g10/g10.c:288
 msgid "force v3 signatures"
 msgstr "devigi v3-subskribojn"
 
-#: g10/g10.c:279
+#: g10/g10.c:289
 msgid "always use a MDC for encryption"
 msgstr "æiam uzi sigelon (MDC) por æifrado"
 
-#: g10/g10.c:280
+#: g10/g10.c:290
 msgid "do not make any changes"
 msgstr "fari neniajn þanøojn"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:282
+#: g10/g10.c:292
+msgid "use the gpg-agent"
+msgstr ""
+
+#: g10/g10.c:293
 msgid "batch mode: never ask"
 msgstr "neinteraga reøimo: neniam demandi"
 
-#: g10/g10.c:283
+#: g10/g10.c:294
 msgid "assume yes on most questions"
 msgstr "supozi \"jes\" æe la plej multaj demandoj"
 
-#: g10/g10.c:284
+#: g10/g10.c:295
 msgid "assume no on most questions"
 msgstr "supozi \"ne\" æe la plej multaj demandoj"
 
-#: g10/g10.c:285
+#: g10/g10.c:296
 msgid "add this keyring to the list of keyrings"
 msgstr "aldoni æi tiun þlosilaron al la listo de þlosilaroj"
 
-#: g10/g10.c:286
+#: g10/g10.c:297
 msgid "add this secret keyring to the list"
 msgstr "aldoni æi tiun sekretan þlosilaron al la listo"
 
-#: g10/g10.c:287
+#: g10/g10.c:298
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan þlosilon"
 
-#: g10/g10.c:288
+#: g10/g10.c:299
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVILO|uzi æi tiun þlosilservilon por seræi þlosilojn"
 
-#: g10/g10.c:289
+#: g10/g10.c:300
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
 
-#: g10/g10.c:290
+#: g10/g10.c:301
 msgid "read options from file"
 msgstr "legi la opciojn el dosiero"
 
-#: g10/g10.c:294
+#: g10/g10.c:305
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
-#: g10/g10.c:299
+#: g10/g10.c:310
 msgid "|KEYID|ulimately trust this key"
-msgstr ""
+msgstr "|KEYID|fidi æi tiun þlosilon absolute"
 
-#: g10/g10.c:300
+#: g10/g10.c:311
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: g10/g10.c:301
+#: g10/g10.c:312
 msgid "emulate the mode described in RFC1991"
 msgstr "imiti la reøimon priskribitan en RFC 1991"
 
-#: g10/g10.c:302
+#: g10/g10.c:313
 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:303
+#: g10/g10.c:314
 msgid "|N|use passphrase mode N"
 msgstr "|N|uzi pasfraz-reøimon N"
 
-#: g10/g10.c:305
+#: g10/g10.c:316
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOMO|uzi kompendi-metodon NOMO por pasfrazoj"
 
-#: g10/g10.c:307
+#: g10/g10.c:318
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOMO|uzi æifrad-metodon NOMO por pasfrazoj"
 
-#: g10/g10.c:308
+#: g10/g10.c:319
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMO|uzi æifrad-metodon NOMO"
 
-#: g10/g10.c:309
+#: g10/g10.c:320
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMO|uzi kompendi-metodon NOMO"
 
-#: g10/g10.c:310
+#: g10/g10.c:321
 msgid "|N|use compress algorithm N"
 msgstr "|N|uzi densig-metodon N"
 
-#: g10/g10.c:311
+#: g10/g10.c:322
 msgid "throw keyid field of encrypted packets"
 msgstr "forigi la þlosilidentigilon de æifritaj paketoj"
 
-#: g10/g10.c:312
+#: g10/g10.c:323
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOMO=VALORO|uzi æi tiun notacian datenon"
 
-#: g10/g10.c:315
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -639,7 +654,7 @@
 "@\n"
 "(Vidu la manpaøon por kompleta listo de æiuj komandoj kaj opcioj)\n"
 
-#: g10/g10.c:318
+#: g10/g10.c:329
 msgid ""
 "@\n"
 "Examples:\n"
@@ -659,15 +674,15 @@
 " --list-keys [nomoj]        montri þlosilojn\n"
 " --fingerprint [nomoj]      montri fingroþpurojn\n"
 
-#: g10/g10.c:418
+#: g10/g10.c:438
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Bonvolu raporti cimojn al <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:422
+#: g10/g10.c:442
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/g10.c:425
+#: g10/g10.c:445
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -677,7 +692,7 @@
 "subskribi, kontroli, æifri aý malæifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/g10.c:432
+#: g10/g10.c:452
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -685,186 +700,191 @@
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/g10.c:511
+#: g10/g10.c:531
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/g10.c:564
+#: g10/g10.c:584
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/g10.c:704
+#: g10/g10.c:734
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:708
+#: g10/g10.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/g10.c:715
+#: g10/g10.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/g10.c:905
+#: g10/g10.c:950
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/g10.c:970
+#: g10/g10.c:1024
 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
+#: g10/g10.c:1028 g10/g10.c:1037
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/g10.c:976
+#: g10/g10.c:1030
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/g10.c:979
+#: g10/g10.c:1033
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:998 g10/g10.c:1010
+#: g10/g10.c:1053 g10/g10.c:1065
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita æifrad-metodo ne validas\n"
 
-#: g10/g10.c:1004 g10/g10.c:1016
+#: g10/g10.c:1059 g10/g10.c:1071
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1075
 msgid "the given policy URL is invalid\n"
 msgstr "la donita gvidlinia URL ne validas\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1078
 #, 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:1025
+#: g10/g10.c:1080
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/g10.c:1027
+#: g10/g10.c:1082
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/g10.c:1029
+#: g10/g10.c:1084
 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:1032
+#: g10/g10.c:1087
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-reøimo (0) estas forte malrekomendata\n"
 
-#: g10/g10.c:1036
+#: g10/g10.c:1091
 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:1121
+#: g10/g10.c:1176
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/g10.c:1127
+#: g10/g10.c:1182
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/g10.c:1134
+#: g10/g10.c:1189
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/g10.c:1142
+#: g10/g10.c:1197
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1210
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1223
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1237
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/g10.c:1199
+#: g10/g10.c:1254
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1262
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1270
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1278
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/g10.c:1239
+#: g10/g10.c:1294
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key uzantidentigilo"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1297
 msgid "--delete-key user-id"
 msgstr "--delete-key uzantidentigilo"
 
-#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
+#: g10/g10.c:1305
+#, fuzzy
+msgid "--delete-secret-and-public-key user-id"
+msgstr "--delete-secret-key uzantidentigilo"
+
+#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1357
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [þlosilaro]"
 
-#: g10/g10.c:1360
+#: g10/g10.c:1423
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:1368
+#: g10/g10.c:1431
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:1439
+#: g10/g10.c:1502
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/g10.c:1520
+#: g10/g10.c:1589
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/g10.c:1524
+#: g10/g10.c:1593
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesaøon ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/g10.c:1737
+#: g10/g10.c:1805
 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:1743
+#: g10/g10.c:1811
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -872,87 +892,87 @@
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn aý substrekojn "
 "kaj fini per '='\n"
 
-#: g10/g10.c:1749
+#: g10/g10.c:1817
 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:1757
+#: g10/g10.c:1825
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/armor.c:302
+#: g10/armor.c:306
 #, c-format
 msgid "armor: %s\n"
 msgstr "kiraso: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:335
 msgid "invalid armor header: "
 msgstr "nevalida kirasoæapo: "
 
-#: g10/armor.c:338
+#: g10/armor.c:342
 msgid "armor header: "
 msgstr "kirasoæapo: "
 
-#: g10/armor.c:349
+#: g10/armor.c:353
 msgid "invalid clearsig header\n"
 msgstr "nevalida æapo de klarteksta subskribo\n"
 
-#: g10/armor.c:401
+#: g10/armor.c:405
 msgid "nested clear text signatures\n"
 msgstr "ingitaj klartekstaj subskriboj\n"
 
-#: g10/armor.c:525
+#: g10/armor.c:529
 msgid "invalid dash escaped line: "
 msgstr "nevalida strek-eskapita linio: "
 
-#: g10/armor.c:537
+#: g10/armor.c:541
 msgid "unexpected armor:"
 msgstr "neatendita kiraso:"
 
-#: g10/armor.c:654
+#: g10/armor.c:667 g10/armor.c:1235
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "nevalida signo %02x en bazo 64 ignorita\n"
 
-#: g10/armor.c:697
+#: g10/armor.c:710
 msgid "premature eof (no CRC)\n"
 msgstr "tro frua dosierfino (nenia CRC)\n"
 
-#: g10/armor.c:731
+#: g10/armor.c:744
 msgid "premature eof (in CRC)\n"
 msgstr "tro frua dosierfino (en CRC)\n"
 
-#: g10/armor.c:735
+#: g10/armor.c:748
 msgid "malformed CRC\n"
 msgstr "misformita CRC\n"
 
-#: g10/armor.c:739
+#: g10/armor.c:752 g10/armor.c:1272
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "CRC-eraro; %06lx - %06lx\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:772
 msgid "premature eof (in Trailer)\n"
 msgstr "tro frua dosierfino (en vosto)\n"
 
-#: g10/armor.c:760
+#: g10/armor.c:776
 msgid "error in trailer line\n"
 msgstr "eraro en vostolinio\n"
 
-#: g10/armor.c:906
+#: g10/armor.c:922
 msgid "For info see http://www.gnupg.org"
 msgstr "Por informoj vidu http://www.gnupg.org"
 
-#: g10/armor.c:1027
+#: g10/armor.c:1050
 msgid "no valid OpenPGP data found.\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/armor.c:1032
+#: g10/armor.c:1055
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "nevalida kiraso: linio pli longa ol %d signojn\n"
 
-#: g10/armor.c:1036
+#: g10/armor.c:1059
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -961,7 +981,7 @@
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "             Fingrospuro:"
 
@@ -1047,7 +1067,7 @@
 
 #: g10/pkclist.c:358
 msgid "Certificates leading to an ultimately trusted key:\n"
-msgstr "Atestiloj, kiuj kondukas fine al fidata þlosilo:\n"
+msgstr "Atestiloj, kiuj kondukas al absolute fidata þlosilo:\n"
 
 #: g10/pkclist.c:429
 msgid ""
@@ -1189,17 +1209,17 @@
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ne estas certe, ke la subskribo apartenas al la posedanto.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorita: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorita: publika þlosilo jam æeestas\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1207,42 +1227,42 @@
 "Vi ne specifis uzantidentigilon. (Vi povas uzi \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "Donu la uzantidentigilon: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "Uzantidentigilo ne ekzistas.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorita: publika þlosilo jam difinita kiel implicita ricevonto\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
 msgstr "Publika þlosilo estas malþaltita.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignorita: publika þlosilo jam difinita per --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: eraro dum kontrolo de þlosilo: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorita: publika þlosilo estas malþaltita\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "mankas validaj adresitoj\n"
 
@@ -1250,62 +1270,66 @@
 msgid "writing self signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:214
+#: g10/keygen.c:217
 msgid "writing key binding signature\n"
 msgstr "skribas þlosilbindan subskribon\n"
 
-#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
+#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "þlosilgrando nevalida; uzas %u bitojn\n"
 
-#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
+#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "þlosilgrando rondigita øis %u bitoj\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:549
 msgid "Please select what kind of key you want:\n"
 msgstr "Bonvolu elekti, kian þlosilon vi deziras:\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:551
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:552
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur subskribi)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:554
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur æifri)\n"
 
-#: g10/keygen.c:546
+#: g10/keygen.c:555
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (subskribi kaj æifri)\n"
 
-#: g10/keygen.c:548
+#: g10/keygen.c:557
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (subskribi kaj æifri)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:561
 msgid "Your selection? "
 msgstr "Via elekto? "
 
-#: g10/keygen.c:563 g10/keygen.c:571
+#: g10/keygen.c:572
 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:585
+#: g10/keygen.c:580
+msgid "The use of this algorithm is deprecated - create anyway? "
+msgstr ""
+
+#: g10/keygen.c:594
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
-#: g10/keygen.c:597
+#: g10/keygen.c:606
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1318,19 +1342,19 @@
 "               implicita þlosilgrando estas 1024 bitoj\n"
 " plej granda rekomendata þlosilgrando estas 2048 bitoj\n"
 
-#: g10/keygen.c:604
+#: g10/keygen.c:613
 msgid "What keysize do you want? (1024) "
 msgstr "Kiun þlosilgrandon vi deziras? (1024) "
 
-#: g10/keygen.c:609
+#: g10/keygen.c:618
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permesas þlosilgrandon nur inter 512 kaj 1024\n"
 
-#: g10/keygen.c:611
+#: g10/keygen.c:620
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "þlosilgrando tro malgranda; 768 estas plej eta permesata valoro.\n"
 
-#: g10/keygen.c:613
+#: g10/keygen.c:622
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "þlosilgrando tro malgranda; 1024 estas plej eta valoro por RSA.\n"
 
@@ -1342,12 +1366,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:624
+#: g10/keygen.c:633
 #, 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:629
+#: g10/keygen.c:638
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1355,11 +1379,11 @@
 "Þlosilgrandoj pli grandaj ol 2048 ne estas rekomendataj,\n"
 "æar la komputado daýras TRE longe!\n"
 
-#: g10/keygen.c:632
+#: g10/keygen.c:641
 msgid "Are you sure that you want this keysize? "
 msgstr "Æu vi estas certa, ke vi deziras æi tiun þlosilgrandon? "
 
-#: g10/keygen.c:633
+#: g10/keygen.c:642
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1367,21 +1391,21 @@
 "Bone, sed pripensu, ke la elradiado de viaj ekrano kaj klavaro estas tre "
 "facile kaptebla!\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:650
 msgid "Do you really need such a large keysize? "
 msgstr "Æu vi vere bezonas tiom grandan þlosilgrandon? "
 
-#: g10/keygen.c:647
+#: g10/keygen.c:656
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Petita þlosilgrando estas %u bitoj\n"
 
-#: g10/keygen.c:650 g10/keygen.c:654
+#: g10/keygen.c:659 g10/keygen.c:663
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rondigita øis %u bitoj\n"
 
-#: g10/keygen.c:702
+#: g10/keygen.c:711
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1397,25 +1421,25 @@
 "      <n>m = þlosilo eksvalidiøos post n monatoj\n"
 "      <n>y = þlosilo eksvalidiøos post n jaroj\n"
 
-#: g10/keygen.c:717
+#: g10/keygen.c:726
 msgid "Key is valid for? (0) "
 msgstr "Þlosilo validu ...? (0) "
 
-#: g10/keygen.c:722
+#: g10/keygen.c:731
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:727
+#: g10/keygen.c:736
 msgid "Key does not expire at all\n"
 msgstr "Þlosilo neniam eksvalidiøos\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:733
+#: g10/keygen.c:742
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Þlosilo eksvalidiøos je %s\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:745
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1423,11 +1447,11 @@
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, øi estos øuste traktata øis 2106.\n"
 
-#: g10/keygen.c:741
+#: g10/keygen.c:750
 msgid "Is this correct (y/n)? "
 msgstr "Æu tio estas øusta (j/n)? "
 
-#: g10/keygen.c:784
+#: g10/keygen.c:793
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1442,44 +1466,44 @@
 "    \"Heinrich Heine (la poeto) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:796
+#: g10/keygen.c:805
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:804
+#: g10/keygen.c:813
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:806
+#: g10/keygen.c:815
 msgid "Name may not start with a digit\n"
 msgstr "Nomo ne povas komenciøi per cifero\n"
 
-#: g10/keygen.c:808
+#: g10/keygen.c:817
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nomo devas havi almenaý 5 signojn\n"
 
-#: g10/keygen.c:816
+#: g10/keygen.c:825
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:827
+#: g10/keygen.c:836
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:835
+#: g10/keygen.c:844
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:841
+#: g10/keygen.c:850
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:864
+#: g10/keygen.c:873
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vi uzas la signaron '%s'.\n"
 
-#: g10/keygen.c:870
+#: g10/keygen.c:879
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1490,27 +1514,27 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:883
 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:879
+#: g10/keygen.c:888
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:889
+#: g10/keygen.c:898
 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:890
+#: g10/keygen.c:899
 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:909
+#: g10/keygen.c:918
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:947
+#: g10/keygen.c:956
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1518,11 +1542,11 @@
 "Vi bezonas pasfrazon por protekti vian sekretan þlosilon.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:964
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "la pasfrazo ne estis øuste ripetita; provu denove.\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:970
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1534,7 +1558,7 @@
 "uzante æi tiun programon kun la opcio \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:982
+#: g10/keygen.c:991
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1546,29 +1570,29 @@
 "kreado de la primoj; tio donas al la stokastilo pli bonan þancon\n"
 "akiri sufiæe da entropio.\n"
 
-#: g10/keygen.c:1431
+#: g10/keygen.c:1440
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA-þlosilparo havos 1024 bitojn.\n"
 
-#: g10/keygen.c:1474
+#: g10/keygen.c:1483
 msgid "Key generation canceled.\n"
 msgstr "Kreado de þlosiloj nuligita.\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1581
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skribas publikan þlosilon al '%s'\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1582
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skribas sekretan þlosilon al '%s'\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1679
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta þlosiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1684
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1576,12 +1600,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:1690 g10/keygen.c:1791
+#: g10/keygen.c:1701 g10/keygen.c:1807
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de þlosiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1748 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1589,7 +1613,7 @@
 "þlosilo estis kreita %lu sekundon en la estonteco (tempotordo aý "
 "horloøeraro)\n"
 
-#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1750 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1597,11 +1621,11 @@
 "þlosilo estis kreita %lu sekundojn en la estonteco (tempotordo aý "
 "horloøeraro)\n"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1783
 msgid "Really create? "
 msgstr "Æu vere krei? "
 
-#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1612,17 +1636,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVERTO: malplena dosiero\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "legas el '%s'\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s-æifrita por: %s\n"
@@ -1647,280 +1671,280 @@
 msgid "key %08lX: not protected - skipped\n"
 msgstr "þlosilo %08lX: ne protektita - ignorita\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:214
 msgid "too many entries in pk cache - disabled\n"
 msgstr "tro da registroj en pk-staplo - malþaltas\n"
 
-#: g10/getkey.c:350
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+msgid "[User id not found]"
+msgstr "[Uzantidentigilo ne trovita]"
+
+#: g10/getkey.c:453
 msgid "too many entries in unk cache - disabled\n"
 msgstr "tro da registroj en unk-staplo - malþaltas\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr "RSA-þlosilo ne estas uzebla kun æi tiu versio\n"
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
-msgstr "Mankas þlosilo por uzantidentigilo\n"
-
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
-msgstr "Mankas uzantidentigilo por þlosilo\n"
-
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2207
 #, 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:2050
-msgid "[User id not found]"
-msgstr "[Uzantidentigilo ne trovita]"
+#: g10/getkey.c:2249 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/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignoras blokon de speco %d\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 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:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "      Nombro traktita entute: %lu\n"
 
-#: g10/import.c:206
-#, fuzzy, c-format
+#: g10/import.c:208
+#, c-format
 msgid "      skipped new keys: %lu\n"
-msgstr "           novaj subþlosiloj: %lu\n"
+msgstr "    ignoritaj novaj þlosiloj: %lu\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         sen uzantidentigilo: %lu\n"
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  neþanøitaj: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      novaj uzantidentigiloj: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novaj subþlosiloj: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "            novaj subskriboj: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "         novaj þlosilrevokoj: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   sekretaj þlosiloj legitaj: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "sekretaj þlosiloj importitaj: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "sekretaj þlosiloj neþanøitaj: %lu\n"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "þlosilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "þlosilo %08lX: mankas valida uzantidentigilo\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 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:418 g10/import.c:657
+#: g10/import.c:435 g10/import.c:684
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "þlosilo %08lX: publika þlosilo ne trovita: %s\n"
 
-#: g10/import.c:423
-#, fuzzy, c-format
+#: g10/import.c:440
+#, c-format
 msgid "key %08lX: new key - skipped\n"
-msgstr "þlosilo %08lX: ne estas RFC-2440-þlosilo - ignorita\n"
+msgstr "þlosilo %08lX: nova þlosilo - ignorita\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "mankas implicita publika þlosilaro\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "ne povas þlosi la þlosilaron '%s': %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eraro dum skribado de þlosilaro '%s': %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "þlosilo %08lX: publika þlosilo importita\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "þlosilo %08lX: diferencas de nia kopio\n"
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:489 g10/import.c:692
 #, 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:478 g10/import.c:671
+#: g10/import.c:495 g10/import.c:698
 #, 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:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "þlosilo %08lX: 1 nova uzantidentigilo\n"
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "þlosilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "þlosilo %08lX: 1 nova subskribo\n"
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "þlosilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "þlosilo %08lX: 1 nova subþlosilo\n"
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "þlosilo %08lX: %d novaj subþlosiloj\n"
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "þlosilo %08lX: ne þanøita\n"
 
-#: g10/import.c:613
+#: g10/import.c:610
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:640
 #, 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:617
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "þlosilo %08lX: jam en sekreta þlosilaro\n"
 
-#: g10/import.c:622
+#: g10/import.c:649
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "þlosilo %08lX: sekreta þlosilo ne trovita: %s\n"
 
-#: g10/import.c:651
+#: g10/import.c:678
 #, 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:682
+#: g10/import.c:709
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "þlosilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
 
-#: g10/import.c:714
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "þlosilo %08lX: revokatestilo importita\n"
 
-#: g10/import.c:756
+#: g10/import.c:783
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "þlosilo %08lX: mankas uzantidentigilo por subskribo\n"
 
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:790 g10/import.c:814
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "þlosilo %08lX: nerealigita publikþlosila metodo\n"
 
-#: g10/import.c:764
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "þlosilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/import.c:779
+#: g10/import.c:806
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "þlosilo %08lX: mankas subþlosilo por þlosilbindado\n"
 
-#: g10/import.c:788
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "þlosilo %08lX: nevalida subþlosila bindado\n"
 
-#: g10/import.c:815
+#: g10/import.c:842
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "þlosilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
 
-#: g10/import.c:844
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "þlosilo %08lX: ignoris uzantidentigilon '"
 
-#: g10/import.c:867
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "þlosilo %08lX: ignoris subþlosilon\n"
@@ -1929,98 +1953,98 @@
 #. * 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:892
+#: g10/import.c:919
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "þlosilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:901
+#: g10/import.c:928
 #, 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:909
+#: g10/import.c:936
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "þlosilo %08lX: nevalida revokatestilo: %s - ignorita\n"
 
-#: g10/import.c:1009
+#: g10/import.c:1036
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "þlosilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:1060
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "þlosilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "þlosilo %08lX: nia kopio ne havas mem-subskribon\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: uzanto ne trovita\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr "[revoko]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr "[mem-subskribo]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
 msgstr "1 malbona subskribo\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d malbonaj subskriboj\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 subskribo ne kontrolita pro manko de þlosilo\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d subskriboj ne kontrolitaj pro manko de þlosiloj\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
 msgstr "1 subskribo ne kontrolita pro eraro\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d subskriboj ne kontrolitaj pro eraroj\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 uzantidentigilo sen valida mem-subskribo estis trovita\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d uzantidentigiloj sen valida mem-subskribo estis trovitaj\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Jam subskribita per þlosilo %08lX\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nenio por subskribi per þlosilo %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2028,7 +2052,7 @@
 "Æu vi estas tute certa, ke vi volas subskribi æi tiun þlosilon\n"
 "per via þlosilo: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2036,33 +2060,33 @@
 "La subskribo estos markita kiel neeksportebla.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "Æu vere subskribi? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "Æi tiu þlosilo ne estas protektita.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:432
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Sekretaj partoj de æefa þlosilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "Þlosilo estas protektita.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ne povas redakti æi tiun þlosilon: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2070,7 +2094,7 @@
 "Donu la novan pasfrazon por æi tiu sekreta þlosilo.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2078,420 +2102,425 @@
 "Vi ne deziras pasfrazon - tio verþajne estas *malbona* ideo!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "Æu vi vere volas fari tion? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr "movas þlosilsubskribon al la øusta loko\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "forlasi æi tiun menuon"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr "f"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr "skribi"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "skribi kaj fini"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr "helpo"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "montri æi tiun helpon"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr "fsp"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr "listo"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
 msgstr "listigi þlosilojn kaj uzantidentigilojn"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr "þlosilo"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "elekti flankan þlosilon N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr "kontroli"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr "listigi subskribojn"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr "k"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr "subskribi"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr "subskribi la þlosilon"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr "lsub"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
 msgstr "subskribi la þlosilon loke"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr "spuri"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr "aluid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr "foruid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
 msgstr "forviþi uzantidentigilon"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr "al"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr "aldoni flankan þlosilon"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr "for"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "forviþi flankan þlosilon"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
 msgstr "forsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
 msgstr "forviþi subskribojn"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr "eksval"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr "þanøi la daton de eksvalidiøo"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr "alia"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "de sekreta aý publika listo iri al la alia"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr "a"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606 g10/keyedit.c:607
 msgid "list preferences"
 msgstr "listigi preferojn"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "pref"
+
+#: g10/keyedit.c:608
 msgid "passwd"
 msgstr "pasf"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:608
 msgid "change the passphrase"
 msgstr "þanøi la pasfrazon"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "trust"
 msgstr "fido"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "change the ownertrust"
 msgstr "þanøi la posedantofidon"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revoke signatures"
 msgstr "revoki subskribojn"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revkey"
 msgstr "rev"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revoke a secondary key"
 msgstr "revoki flankan þlosilon"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable"
 msgstr "el"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable a key"
 msgstr "malþalti þlosilon"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable"
 msgstr "en"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable a key"
 msgstr "þalti þlosilon"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:633
 msgid "can't do that in batchmode\n"
 msgstr "ne povas fari tion en neinteraga reøimo\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:669
+#: g10/keyedit.c:671
 msgid "Secret key is available.\n"
 msgstr "Sekreta þlosilo estas havebla.\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:700
 msgid "Command> "
 msgstr "Komando> "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 msgid "Need the secret key to do this.\n"
 msgstr "Bezonas la sekretan þlosilon por fari tion.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:781
 msgid "Really sign all user IDs? "
 msgstr "Æu vere subskribi æiujn uzantidentigilojn? "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:782
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:814 g10/keyedit.c:1000
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:825 g10/keyedit.c:846
 msgid "You must select at least one user ID.\n"
 msgstr "Vi devas elekti almenaý unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:827
 msgid "You can't delete the last user ID!\n"
 msgstr "Vi ne povas forviþi la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:830
 msgid "Really remove all selected user IDs? "
 msgstr "Æu vere forigi æiujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:831
 msgid "Really remove this user ID? "
 msgstr "Æu vere forigi æi tiun uzantidentigilon? "
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:867 g10/keyedit.c:889
 msgid "You must select at least one key.\n"
 msgstr "Vi devas elekti almenaý unu þlosilon.\n"
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:871
 msgid "Do you really want to delete the selected keys? "
 msgstr "Æu vi vere volas forviþi la elektitajn þlosilojn? "
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:872
 msgid "Do you really want to delete this key? "
 msgstr "Æu vi vere volas forviþi æi tiun þlosilon? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Æu vi vere volas revoki la elektitajn þlosilojn? "
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:894
 msgid "Do you really want to revoke this key? "
 msgstr "Æu vi vere volas revoki æi tiun þlosilon? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
 msgid "Save changes? "
 msgstr "Æu skribi þanøojn? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:967
 msgid "Quit without saving? "
 msgstr "Æu fini sen skribi þanøojn? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:978
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:985
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:992
 msgid "Key not changed so no update needed.\n"
 msgstr "Þlosilo ne þanøita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1007
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  kreita: %s eksvalidiøos: %s"
 
-#: g10/keyedit.c:1090
+#: g10/keyedit.c:1140
 #, c-format
 msgid " trust: %c/%c"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1144
 msgid "This key has been disabled"
 msgstr "Æi tiu þlosilo estas malþaltita"
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1173
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subþlosilo estas revokita: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1176
 msgid "rev- faked revocation found\n"
 msgstr "rev- falsita revoko trovita\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1178
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problemo en kontrolo de revoko: %s\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1420
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Æu forviþi æi tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1424
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Æu forviþi æi tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1428
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Æu forviþi æi tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1434
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Æu vere forviþi æi tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1448
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forviþis %d subskribon.\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1449
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forviþis %d subskribojn.\n"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1452
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forviþita.\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn þlosilojn.\n"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1527
 msgid "Please select at most one secondary key.\n"
 msgstr "Bonvolu elekti maksimume unu flankan þlosilon.\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1531
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Þanøas la daton de eksvalidiøo de flanka þlosilo.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Þanøas la daton de eksvalidiøo de la æefa þlosilo.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1575
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vi ne povas þanøi la daton de eksvalidiøo de v3-þlosilo\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1591
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta þlosilaro\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1652
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1698
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Mankas flanka þlosilo kun indekso %d\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1796
 msgid "user ID: \""
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1799
 #, c-format
 msgid ""
 "\"\n"
@@ -2500,170 +2529,168 @@
 "\"\n"
 "subskribita per via þlosilo %08lX je %s\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1803
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Æu krei revokatestilon por æi tiu subskribo? (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1827
 msgid "You have signed these user IDs:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   subskribita per %08lX je %s\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1846
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1866
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1884
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Æu vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1913
 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:400 g10/mainproc.c:790
+#: g10/keylist.c:279 g10/mainproc.c:851
 #, c-format
 msgid " [expires: %s]"
 msgstr " [eksvalidiøos: %s]"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:269
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "publika þlosilo estas %08lX\n"
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:314
 msgid "public key encrypted data: good DEK\n"
 msgstr "publikþlosile æifritaj datenoj: bona DEK\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:366
 #, 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:336
+#: g10/mainproc.c:376
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "æifrita per %s-þlosilo, %08lX\n"
 
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr "mankas sekreta þlosilo por malæifrado\n"
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:390
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "publikþlosila malæifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:430
 msgid "decryption okay\n"
 msgstr "malæifrado sukcesis\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:435
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: æifrita mesaøo estis manipulita!\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:440
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "malæifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:459
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:461
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:632
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki øin\n"
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:719 g10/mainproc.c:728
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVERTO: nevalida notacia dateno trovita\n"
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:731
 msgid "Notation: "
 msgstr "Notacio: "
 
-#: g10/mainproc.c:680
+#: g10/mainproc.c:740
 msgid "Policy: "
 msgstr "Gvidlinio: "
 
-#: g10/mainproc.c:1121
+#: g10/mainproc.c:1193
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas malþaltita\n"
 
-#: g10/mainproc.c:1158
+#. plaintext before signatures but no one-pass packets
+#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#, fuzzy
+msgid "can't handle these multiple signatures\n"
+msgstr "ingitaj klartekstaj subskriboj\n"
+
+#: g10/mainproc.c:1256
 #, 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:1184 g10/mainproc.c:1195
+#: g10/mainproc.c:1284 g10/mainproc.c:1292
 msgid "BAD signature from \""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1196
+#: g10/mainproc.c:1285 g10/mainproc.c:1293
 msgid "Good signature from \""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1243
+#: g10/mainproc.c:1358
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:1318
+#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "fari apartan subskribon"
+
+#: g10/mainproc.c:1454
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1511
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1518
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ne povas malþalti kreadon de core-dosieroj: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Eksperimentaj metodoj ne estu uzataj!\n"
 
-#: g10/misc.c:234
-msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
+#: g10/misc.c:238
+#, fuzzy
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr "æi tiu æifrad-metodo estas malrekomendata; bonvolu uzi pli normalan!\n"
 
 #: g10/parse-packet.c:119
@@ -2671,12 +2698,68 @@
 msgid "can't handle public key algorithm %d\n"
 msgstr "ne povas trakti publikþlosilan metodon %d\n"
 
-#: g10/parse-packet.c:991
+#: g10/parse-packet.c:1010
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas þaltitan \"critical bit\"\n"
 
-#: g10/passphrase.c:159
+#: g10/passphrase.c:223
+msgid "gpg-agent is not available in this session\n"
+msgstr ""
+
+#: g10/passphrase.c:229
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr ""
+
+#: g10/hkp.c:167 g10/passphrase.c:248
+#, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "ne povas konektiøi al '%s': %s\n"
+
+#: g10/passphrase.c:313 g10/passphrase.c:576
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr " (æefþlosilo %08lX)"
+
+#: g10/passphrase.c:323
+#, fuzzy, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"\n"
+"Vi bezonas pasfrazon por malþlosi la sekretan þlosilon\n"
+"por la uzanto: \""
+
+#: g10/passphrase.c:344
+#, fuzzy
+msgid "Enter passphrase\n"
+msgstr "Donu pasfrazon: "
+
+#: g10/passphrase.c:346
+#, fuzzy
+msgid "Repeat passphrase\n"
+msgstr "Ripetu pasfrazon: "
+
+#: g10/passphrase.c:384
+msgid "passphrase too long\n"
+msgstr ""
+
+#: g10/passphrase.c:396
+msgid "invalid response from agent\n"
+msgstr ""
+
+#: g10/passphrase.c:405
+msgid "cancelled by user\n"
+msgstr ""
+
+#: g10/passphrase.c:408 g10/passphrase.c:477
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr ""
+
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2686,25 +2769,20 @@
 "Vi bezonas pasfrazon por malþlosi la sekretan þlosilon\n"
 "por la uzanto: \""
 
-#: g10/passphrase.c:168
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bita %s-þlosilo, %08lX, kreita je %s"
 
-#: g10/passphrase.c:173
-#, c-format
-msgid " (main key ID %08lX)"
-msgstr " (æefþlosilo %08lX)"
-
-#: g10/passphrase.c:190
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
 msgstr "ne povas kontroli pasvorton en neinteraga reøimo\n"
 
-#: g10/passphrase.c:194
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr "Donu pasfrazon: "
 
-#: g10/passphrase.c:198
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr "Ripetu pasfrazon: "
 
@@ -2712,19 +2790,24 @@
 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:324
+#: g10/plaintext.c:332
 msgid "Detached signature.\n"
 msgstr "Aparta subskribo.\n"
 
-#: g10/plaintext.c:328
+#: g10/plaintext.c:336
 msgid "Please enter name of data file: "
 msgstr "Bonvolu doni la nomon de la dosiero: "
 
-#: g10/plaintext.c:349
+#: g10/plaintext.c:357
 msgid "reading stdin ...\n"
 msgstr "legas la normalan enigon ...\n"
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:391
+#, fuzzy
+msgid "no signed data\n"
+msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
+
+#: g10/plaintext.c:399
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
@@ -2757,41 +2840,36 @@
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTO: sekreta þlosilo %08lX eksvalidiøis je %s\n"
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr "petas la þlosilon %08lX de %s ...\n"
 
-#: g10/hkp.c:85
+#: g10/hkp.c:83
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "ne povas akiri þlosilon de þlosilservilo: %s\n"
 
-#: g10/hkp.c:109 g10/hkp.c:148
+#: g10/hkp.c:102 g10/hkp.c:136
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "neniu þlosilservilo konata (uzu la opcion --keyserver)\n"
 
-#: g10/hkp.c:117
+#: g10/hkp.c:110
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: ne valida þlosilidentigilo\n"
 
-#: 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:194
+#: g10/hkp.c:191
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:203
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "sukceso dum sendo al '%s' (statuso=%u)\n"
 
-#: g10/hkp.c:209
+#: g10/hkp.c:206
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "malsukceso dum sendo al '%s': statuso=%u\n"
@@ -2835,30 +2913,35 @@
 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:324
-#, c-format
-msgid "NOTE: signature key expired %s\n"
+#: g10/sig-check.c:328
+#, fuzzy, c-format
+msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTO: subskribo-þlosilo eksvalidiøis je %s\n"
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n"
 
-#: g10/sign.c:140
+#: g10/sign.c:152
+#, fuzzy, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "Ne povas kontroli subskribon: %s\n"
+
+#: g10/sign.c:161
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:307 g10/sign.c:630
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:405
 msgid "signing:"
 msgstr "subskribas:"
 
-#: g10/sign.c:431
+#: g10/sign.c:448
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
@@ -2897,7 +2980,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: dosierujo ne ekzistas!\n"
 
-#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
+#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: ne povas krei: %s\n"
@@ -3043,9 +3126,9 @@
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
 #: g10/trustdb.c:474
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid long keyID\n"
-msgstr "%s: ne valida þlosilidentigilo\n"
+msgstr "'%s' ne estas valida longa þlosilidentigilo\n"
 
 #: g10/trustdb.c:501
 #, c-format
@@ -3068,20 +3151,15 @@
 msgstr "þlosilo %08lX: akceptita kiel fidata þlosilo.\n"
 
 #: g10/trustdb.c:546
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
-msgstr "þlosilo %08lX: ne protektita - ignorita\n"
+msgstr "þlosilo %08lX: mankas publika þlosilo por fidata þlosilo - 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"
@@ -3290,7 +3368,7 @@
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "AVERTO: ne povas trakti longajn preferoregistrojn\n"
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -3300,7 +3378,7 @@
 "Bonvolu memori, ke la subskribodosiero (.sig aý .asc)\n"
 "devas esti la unua dosiero donita en la komandlinio.\n"
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "enigata linio %u tro longa, aý mankas linifino\n"
@@ -3310,41 +3388,51 @@
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: ne povas krei þlosilaron: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1374
+#: g10/ringedit.c:319 g10/ringedit.c:1376
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: þlosilaro kreita\n"
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1557
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVERTO: ekzistas 2 dosieroj kun sekretaj informoj.\n"
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1558
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s estas la neþanøita\n"
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1559
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s estas la nova\n"
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1560
 msgid "Please fix this possible security flaw\n"
 msgstr "Bonvolu ripari æi tiun eblan sekurecproblemon\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "þlosilo ne estas markita kiel malsekura - ne povas uzi øin kun falsa "
 "stokastilo!\n"
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, fuzzy, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "ignoris '%s': %s\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "ignoris '%s': %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+#, fuzzy
+msgid "skipped: secret key already present\n"
+msgstr "%s: ignorita: publika þlosilo jam æeestas\n"
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3372,31 +3460,31 @@
 msgid "Enter new filename"
 msgstr "Donu novan dosiernomon"
 
-#: g10/openfile.c:182
+#: g10/openfile.c:184
 msgid "writing to stdout\n"
 msgstr "skribas al la normala eligo\n"
 
-#: g10/openfile.c:261
+#: g10/openfile.c:273
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "supozas subskribitajn datenojn en '%s'\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:323
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/openfile.c:338
+#: g10/openfile.c:350
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: g10/openfile.c:341
+#: g10/openfile.c:353
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: dosierujo kreita\n"
 
-#: g10/openfile.c:343
+#: g10/openfile.c:355
 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"
@@ -3417,6 +3505,11 @@
 msgstr ""
 "AVERTO: mesaøo estis æifrita per malforta þlosilo en la simetria æifro.\n"
 
+#: g10/encr-data.c:97
+#, fuzzy
+msgid "problem handling encrypted packet\n"
+msgstr "forigi la þlosilidentigilon de æifritaj paketoj"
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "malforta þlosilo kreita - provas denove\n"
@@ -3427,14 +3520,6 @@
 msgstr ""
 "ne povas eviti malfortajn þlosilojn por simetria æifro; provis %d fojojn!\n"
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "mankas sekreta þlosilo por æi tiu publika þlosilo!\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr "uzu la opcion \"--delete-secret-key\" por forviþi øin unue.\n"
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "ne povas fari tion en neinteraga reøimo sen \"--yes\"\n"
@@ -3447,6 +3532,14 @@
 msgid "This is a secret key! - really delete? "
 msgstr "Tio estas sekreta þlosilo! Æu vere forviþi øin? "
 
+#: g10/delkey.c:181
+msgid "there is a secret key for this public key!\n"
+msgstr "mankas sekreta þlosilo por æi tiu publika þlosilo!\n"
+
+#: g10/delkey.c:183
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr "uzu la opcion \"--delete-secret-key\" por forviþi øin unue.\n"
+
 #: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
@@ -3706,9 +3799,20 @@
 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"
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "RSA-þlosilo ne estas uzebla kun æi tiu versio\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Mankas þlosilo por uzantidentigilo\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Mankas uzantidentigilo por þlosilo\n"
+
+#~ msgid "invalid"
+#~ msgstr "nevalida"
+
+#~ msgid "revoked"
+#~ msgstr "revokita"
+
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "mankas sekreta þlosilo por malæifrado\n"
diff -urN gnupg-1.0.4/po/es_ES.po gnupg-1.0.5/po/es_ES.po
--- gnupg-1.0.4/po/es_ES.po	Tue Oct 17 15:40:36 2000
+++ gnupg-1.0.5/po/es_ES.po	Sun Apr 29 16:39:24 2001
@@ -7,7 +7,7 @@
 # GPG version: 1.0.0
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-10-16 19:22+0200\n"
+"POT-Creation-Date: 2001-04-29 16:39+0200\n"
 "PO-Revision-Date: 1999-10-27 06:35+0200\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-13 10:49:25+0100\n"
@@ -26,35 +26,35 @@
 msgid "Warning: using insecure memory!\n"
 msgstr "ATENCIÓN: ¡se está usando memoria insegura!\n"
 
-#: util/secmem.c:295
+#: util/secmem.c:299
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operación imposible sin memoria segura inicializada\n"
 
-#: util/secmem.c:296
+#: util/secmem.c:300
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:287 util/miscutil.c:316
 msgid "yes"
 msgstr "sí"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:288 util/miscutil.c:319
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:289 util/miscutil.c:317
 msgid "no"
 msgstr ""
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:290 util/miscutil.c:320
 msgid "nN"
 msgstr ""
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:318
 msgid "quit"
 msgstr ""
 
-#: util/miscutil.c:311
+#: util/miscutil.c:321
 msgid "qQ"
 msgstr ""
 
@@ -255,6 +255,17 @@
 msgid "not processed"
 msgstr "se han procesado %lu claves\n"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "Clave pública incorrecta"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "Clave secreta incorrecta"
+
 #: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -265,64 +276,64 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Ha encontrado Vd. un bug... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:324
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:329
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:325
+#: cipher/random.c:334
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:331
+#: cipher/random.c:340
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:339
+#: cipher/random.c:348
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:386
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:397
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no puede crearse %s: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:413
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:416
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:427
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:650
+#: cipher/random.c:661
 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:651
+#: cipher/random.c:662
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -348,7 +359,7 @@
 "otro trabajo para que el sistema pueda recolectar más entropía\n"
 "(se necesitan %d bytes más).\n"
 
-#: g10/g10.c:206
+#: g10/g10.c:216
 msgid ""
 "@Commands:\n"
 " "
@@ -356,140 +367,140 @@
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:208
+#: g10/g10.c:218
 msgid "|[file]|make a signature"
 msgstr "|[file]|hace una firma"
 
-#: g10/g10.c:209
+#: g10/g10.c:219
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|hace una firma en texto claro"
 
-#: g10/g10.c:210
+#: g10/g10.c:220
 msgid "make a detached signature"
 msgstr "hace una firma separada"
 
-#: g10/g10.c:211
+#: g10/g10.c:221
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/g10.c:212
+#: g10/g10.c:222
 msgid "encryption only with symmetric cipher"
 msgstr "cifra sólo con un cifrado simétrico"
 
-#: g10/g10.c:213
+#: g10/g10.c:223
 msgid "store only"
 msgstr "sólo almacenar"
 
-#: g10/g10.c:214
+#: g10/g10.c:224
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/g10.c:215
+#: g10/g10.c:225
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:217
+#: g10/g10.c:227
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/g10.c:219
+#: g10/g10.c:229
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/g10.c:220
+#: g10/g10.c:230
 msgid "check key signatures"
 msgstr "comprueba las firmas de las claves"
 
-#: g10/g10.c:221
+#: g10/g10.c:231
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/g10.c:222
+#: g10/g10.c:232
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/g10.c:223
+#: g10/g10.c:233
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/g10.c:224
+#: g10/g10.c:234
 msgid "remove key from the public keyring"
 msgstr "elimina la clave del anillo público"
 
-#: g10/g10.c:226
+#: g10/g10.c:236
 #, fuzzy
 msgid "remove key from the secret keyring"
 msgstr "elimina la clave del anillo público"
 
-#: g10/g10.c:227
+#: g10/g10.c:237
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/g10.c:228
+#: g10/g10.c:238
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/g10.c:229
+#: g10/g10.c:239
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/g10.c:230
+#: g10/g10.c:240
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocación"
 
-#: g10/g10.c:231
+#: g10/g10.c:241
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/g10.c:232
+#: g10/g10.c:242
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/g10.c:233
+#: g10/g10.c:243
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/g10.c:237
+#: g10/g10.c:247
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/g10.c:239
+#: g10/g10.c:249
 msgid "list only the sequence of packets"
 msgstr "lista sólo la secuencia de paquetes"
 
-#: g10/g10.c:241
+#: g10/g10.c:251
 msgid "export the ownertrust values"
 msgstr "exporta los valores de confianza"
 
-#: g10/g10.c:243
+#: g10/g10.c:253
 msgid "import ownertrust values"
 msgstr "importa los valores de confianza"
 
-#: g10/g10.c:245
+#: g10/g10.c:255
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/g10.c:247
+#: g10/g10.c:257
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMBRES]|comprueba la base de datos de confianza"
 
-#: g10/g10.c:248
+#: g10/g10.c:258
 msgid "fix a corrupted trust database"
 msgstr "arregla una base de datos de confianza dañada"
 
-#: g10/g10.c:249
+#: g10/g10.c:259
 msgid "De-Armor a file or stdin"
 msgstr "quita la armadura de un fichero o stdin"
 
-#: g10/g10.c:251
+#: g10/g10.c:261
 msgid "En-Armor a file or stdin"
 msgstr "crea la armadura a un fichero o stdin"
 
-#: g10/g10.c:253
+#: g10/g10.c:263
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime resúmenes de mensaje"
 
-#: g10/g10.c:257
+#: g10/g10.c:267
 msgid ""
 "@\n"
 "Options:\n"
@@ -499,164 +510,168 @@
 "Opciones:\n"
 " "
 
-#: g10/g10.c:259
+#: g10/g10.c:269
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/g10.c:261
+#: g10/g10.c:271
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/g10.c:264
+#: g10/g10.c:274
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: g10/g10.c:266
+#: g10/g10.c:276
 msgid "use the default key as default recipient"
 msgstr "usa la clave por defecto como destinatario"
 
-#: g10/g10.c:270
+#: g10/g10.c:280
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/g10.c:271
+#: g10/g10.c:281
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresión N (0 no comprime)"
 
-#: g10/g10.c:273
+#: g10/g10.c:283
 msgid "use canonical text mode"
 msgstr "usa modo de texto canónico"
 
-#: g10/g10.c:274
+#: g10/g10.c:284
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/g10.c:275
+#: g10/g10.c:285
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/g10.c:276
+#: g10/g10.c:286
 msgid "be somewhat more quiet"
 msgstr "algo más discreto"
 
-#: g10/g10.c:277
+#: g10/g10.c:287
 msgid "don't use the terminal at all"
 msgstr "no usa la terminal en absoluto"
 
-#: g10/g10.c:278
+#: g10/g10.c:288
 msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:279
+#: g10/g10.c:289
 msgid "always use a MDC for encryption"
 msgstr "siempre usa un MCD para cifrar"
 
-#: g10/g10.c:280
+#: g10/g10.c:290
 msgid "do not make any changes"
 msgstr "no hace ningún cambio"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:282
+#: g10/g10.c:292
+msgid "use the gpg-agent"
+msgstr ""
+
+#: g10/g10.c:293
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
-#: g10/g10.c:283
+#: g10/g10.c:294
 msgid "assume yes on most questions"
 msgstr "asume \"sí\" en casi todas las preguntas"
 
-#: g10/g10.c:284
+#: g10/g10.c:295
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: g10/g10.c:285
+#: g10/g10.c:296
 msgid "add this keyring to the list of keyrings"
 msgstr "añade este anillo a la lista de anillos"
 
-#: g10/g10.c:286
+#: g10/g10.c:297
 msgid "add this secret keyring to the list"
 msgstr "añade este anillo secreto a la lista"
 
-#: g10/g10.c:287
+#: g10/g10.c:298
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: g10/g10.c:288
+#: g10/g10.c:299
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVIDOR|usa este servidor de claves"
 
-#: g10/g10.c:289
+#: g10/g10.c:300
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
 
-#: g10/g10.c:290
+#: g10/g10.c:301
 msgid "read options from file"
 msgstr "lee opciones del fichero"
 
-#: g10/g10.c:294
+#: g10/g10.c:305
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe información de estado en descriptor DF"
 
-#: g10/g10.c:299
+#: g10/g10.c:310
 msgid "|KEYID|ulimately trust this key"
 msgstr "|ID-CLAVE|confía plenamente en esta clave"
 
-#: g10/g10.c:300
+#: g10/g10.c:311
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHERO|carga módulo de extensiones FICHERO"
 
-#: g10/g10.c:301
+#: g10/g10.c:312
 msgid "emulate the mode described in RFC1991"
 msgstr "emula el modo descrito en la RFC1991"
 
-#: g10/g10.c:302
+#: g10/g10.c:313
 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:303
+#: g10/g10.c:314
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa modo de contraseña N"
 
-#: g10/g10.c:305
+#: g10/g10.c:316
 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:307
+#: g10/g10.c:318
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las\n"
 "contraseñas"
 
-#: g10/g10.c:308
+#: g10/g10.c:319
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 
-#: g10/g10.c:309
+#: g10/g10.c:320
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: g10/g10.c:310
+#: g10/g10.c:321
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa el algoritmo de compresión N"
 
-#: g10/g10.c:311
+#: g10/g10.c:322
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina campo keyid de los paquetes cifrados"
 
-#: g10/g10.c:312
+#: g10/g10.c:323
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOMBRE=VALOR|usa estos datos de notación"
 
-#: g10/g10.c:315
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:318
+#: g10/g10.c:329
 msgid ""
 "@\n"
 "Examples:\n"
@@ -676,15 +691,15 @@
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/g10.c:418
+#: g10/g10.c:438
 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:422
+#: g10/g10.c:442
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/g10.c:425
+#: g10/g10.c:445
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -694,7 +709,7 @@
 "Firma, comprueba, cifra o descifra.\n"
 "La operación por defecto depende del tipo de datos de entrada.\n"
 
-#: g10/g10.c:432
+#: g10/g10.c:452
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -702,186 +717,191 @@
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/g10.c:511
+#: g10/g10.c:531
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/g10.c:564
+#: g10/g10.c:584
 msgid "conflicting commands\n"
 msgstr "comandos incompatibles\n"
 
-#: g10/g10.c:704
+#: g10/g10.c:734
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:708
+#: g10/g10.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:715
+#: g10/g10.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:905
+#: g10/g10.c:950
 #, 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:970
+#: g10/g10.c:1024
 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
+#: g10/g10.c:1028 g10/g10.c:1037
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: ¡%s no es para uso normal!\n"
 
-#: g10/g10.c:976
+#: g10/g10.c:1030
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "¡%s no permitido con %s!\n"
 
-#: g10/g10.c:979
+#: g10/g10.c:1033
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "¡%s no tiene sentido con %s!\n"
 
-#: g10/g10.c:998 g10/g10.c:1010
+#: g10/g10.c:1053 g10/g10.c:1065
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado no es válido\n"
 
-#: g10/g10.c:1004 g10/g10.c:1016
+#: g10/g10.c:1059 g10/g10.c:1071
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no es válido\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1075
 msgid "the given policy URL is invalid\n"
 msgstr "URL de política no válida\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1078
 #, 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:1025
+#: g10/g10.c:1080
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:1027
+#: g10/g10.c:1082
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:1029
+#: g10/g10.c:1084
 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:1032
+#: g10/g10.c:1087
 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:1036
+#: g10/g10.c:1091
 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:1121
+#: g10/g10.c:1176
 #, 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:1127
+#: g10/g10.c:1182
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:1134
+#: g10/g10.c:1189
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:1142
+#: g10/g10.c:1197
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1210
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1223
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1237
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:1199
+#: g10/g10.c:1254
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1262
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1270
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1278
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [comandos]"
 
-#: g10/g10.c:1239
+#: g10/g10.c:1294
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-usuario"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1297
 msgid "--delete-key user-id"
 msgstr "--delete-key id-usuario"
 
-#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
+#: g10/g10.c:1305
+#, fuzzy
+msgid "--delete-secret-and-public-key user-id"
+msgstr "--delete-secret-key id-usuario"
+
+#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1357
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/g10.c:1360
+#: g10/g10.c:1423
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminación de armadura fallida: %s\n"
 
-#: g10/g10.c:1368
+#: g10/g10.c:1431
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creación de armadura fallida: %s\n"
 
-#: g10/g10.c:1439
+#: g10/g10.c:1502
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribución no válido `%s'\n"
 
-#: g10/g10.c:1520
+#: g10/g10.c:1589
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
-#: g10/g10.c:1524
+#: g10/g10.c:1593
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no puede abrirse `%s'\n"
 
-#: g10/g10.c:1737
+#: g10/g10.c:1805
 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:1743
+#: g10/g10.c:1811
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -889,87 +909,87 @@
 "un nombre de notación debe tener sólo letras, dígitos, puntos o subrayados, "
 "y acabar con un '='\n"
 
-#: g10/g10.c:1749
+#: g10/g10.c:1817
 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:1757
+#: g10/g10.c:1825
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notación no debe usar ningún caracter de control\n"
 
-#: g10/armor.c:302
+#: g10/armor.c:306
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:335
 msgid "invalid armor header: "
 msgstr "cabecera de armadura no válida: "
 
-#: g10/armor.c:338
+#: g10/armor.c:342
 msgid "armor header: "
 msgstr "cabecera de armadura: "
 
-#: g10/armor.c:349
+#: g10/armor.c:353
 msgid "invalid clearsig header\n"
 msgstr "cabecera de firma clara no válida\n"
 
-#: g10/armor.c:401
+#: g10/armor.c:405
 msgid "nested clear text signatures\n"
 msgstr "firmas en texto claro anidadas\n"
 
-#: g10/armor.c:525
+#: g10/armor.c:529
 msgid "invalid dash escaped line: "
 msgstr "Línea con guiones no válida: "
 
-#: g10/armor.c:537
+#: g10/armor.c:541
 msgid "unexpected armor:"
 msgstr "armadura inesperada"
 
-#: g10/armor.c:654
+#: g10/armor.c:667 g10/armor.c:1235
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracteres no válidos radix64 %02x ignorados\n"
 
-#: g10/armor.c:697
+#: g10/armor.c:710
 msgid "premature eof (no CRC)\n"
 msgstr "Fin de fichero prematuro\n"
 
-#: g10/armor.c:731
+#: g10/armor.c:744
 msgid "premature eof (in CRC)\n"
 msgstr "Fin de suma de comprobación prematuro\n"
 
-#: g10/armor.c:735
+#: g10/armor.c:748
 msgid "malformed CRC\n"
 msgstr "Suma de comprobación mal creada\n"
 
-#: g10/armor.c:739
+#: g10/armor.c:752 g10/armor.c:1272
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "Error en suma de comprobación: %06lx - %06lx\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:772
 msgid "premature eof (in Trailer)\n"
 msgstr "fin de fichero prematuro (en el cierre)\n"
 
-#: g10/armor.c:760
+#: g10/armor.c:776
 msgid "error in trailer line\n"
 msgstr "error en la línea de cierre\n"
 
-#: g10/armor.c:906
+#: g10/armor.c:922
 msgid "For info see http://www.gnupg.org"
 msgstr ""
 
-#: g10/armor.c:1027
+#: g10/armor.c:1050
 msgid "no valid OpenPGP data found.\n"
 msgstr "no se han encontrados datos OpenPGP válidos\n"
 
-#: g10/armor.c:1032
+#: g10/armor.c:1055
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura incorrecta: línea más larga de %d caracteres\n"
 
-#: g10/armor.c:1036
+#: g10/armor.c:1059
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -978,7 +998,7 @@
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "         Huella dactilar:"
 
@@ -1210,17 +1230,17 @@
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "          No es seguro que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: clave pública ya presente\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1228,42 +1248,42 @@
 "No se ha especificado un ID de usuario (puede usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "Introduzca el ID de usuario: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "ID de usuario inexistente.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: clave pública ya designada como destinataria por defecto\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
 msgstr "Clave pública deshabilitada.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignorado: clave pública ya designada con --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "desconocido el destinatario predefinido `%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: error comprobando la clave: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: clave pública deshabilitada\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "no hay direcciones válidas\n"
 
@@ -1271,62 +1291,66 @@
 msgid "writing self signature\n"
 msgstr "escribiendo autofirma\n"
 
-#: g10/keygen.c:214
+#: g10/keygen.c:217
 msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobación de clave\n"
 
-#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
+#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "El tamaño requerido es de %u bits\n"
 
-#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
+#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:549
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:551
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA y ElGamal (por defecto)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:552
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sólo firma)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:554
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (sólo cifrado)\n"
 
-#: g10/keygen.c:546
+#: g10/keygen.c:555
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma y cifrado)\n"
 
-#: g10/keygen.c:548
+#: g10/keygen.c:557
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma y cifrado)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:561
 msgid "Your selection? "
 msgstr "Su elección: "
 
-#: g10/keygen.c:563 g10/keygen.c:571
+#: g10/keygen.c:572
 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:585
+#: g10/keygen.c:580
+msgid "The use of this algorithm is deprecated - create anyway? "
+msgstr ""
+
+#: g10/keygen.c:594
 msgid "Invalid selection.\n"
 msgstr "Elección no válida.\n"
 
-#: g10/keygen.c:597
+#: g10/keygen.c:606
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1339,19 +1363,19 @@
 "        el tamaño por defecto es 1024 bits\n"
 " el tamaño máximo recomendado es 2048 bits\n"
 
-#: g10/keygen.c:604
+#: g10/keygen.c:613
 msgid "What keysize do you want? (1024) "
 msgstr "¿De qué tamaño quiere la clave (1024)? "
 
-#: g10/keygen.c:609
+#: g10/keygen.c:618
 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:611
+#: g10/keygen.c:620
 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:613
+#: g10/keygen.c:622
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "tamaño insuficiente; 768 es el valor mínimo permitido\n"
@@ -1364,12 +1388,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:624
+#: g10/keygen.c:633
 #, 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:629
+#: g10/keygen.c:638
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1377,11 +1401,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:632
+#: g10/keygen.c:641
 msgid "Are you sure that you want this keysize? "
 msgstr "¿Seguro que quiere una clave de este tamaño? "
 
-#: g10/keygen.c:633
+#: g10/keygen.c:642
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1390,21 +1414,21 @@
 "teclado\n"
 "también son vulnerables a un ataque!\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:650
 msgid "Do you really need such a large keysize? "
 msgstr "¿De verdad necesita una clave tan grande? "
 
-#: g10/keygen.c:647
+#: g10/keygen.c:656
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tamaño requerido es de %u bits\n"
 
-#: g10/keygen.c:650 g10/keygen.c:654
+#: g10/keygen.c:659 g10/keygen.c:663
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:702
+#: g10/keygen.c:711
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1420,35 +1444,35 @@
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n años\n"
 
-#: g10/keygen.c:717
+#: g10/keygen.c:726
 msgid "Key is valid for? (0) "
 msgstr "¿Validez de la clave (0)? "
 
-#: g10/keygen.c:722
+#: g10/keygen.c:731
 msgid "invalid value\n"
 msgstr "valor no válido\n"
 
-#: g10/keygen.c:727
+#: g10/keygen.c:736
 msgid "Key does not expire at all\n"
 msgstr "La clave nunca caduca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:733
+#: g10/keygen.c:742
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clave caduca el %s\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:745
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:741
+#: g10/keygen.c:750
 msgid "Is this correct (y/n)? "
 msgstr "¿Es correcto (s/n)? "
 
-#: g10/keygen.c:784
+#: g10/keygen.c:793
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1466,44 +1490,44 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:796
+#: g10/keygen.c:805
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:804
+#: g10/keygen.c:813
 msgid "Invalid character in name\n"
 msgstr "Caracter no válido en el nombre\n"
 
-#: g10/keygen.c:806
+#: g10/keygen.c:815
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un número\n"
 
-#: g10/keygen.c:808
+#: g10/keygen.c:817
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:816
+#: g10/keygen.c:825
 msgid "Email address: "
 msgstr "Dirección de correo electrónico: "
 
-#: g10/keygen.c:827
+#: g10/keygen.c:836
 msgid "Not a valid email address\n"
 msgstr "Dirección no válida\n"
 
-#: g10/keygen.c:835
+#: g10/keygen.c:844
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:841
+#: g10/keygen.c:850
 msgid "Invalid character in comment\n"
 msgstr "Caracter no válido en el comentario\n"
 
-#: g10/keygen.c:864
+#: g10/keygen.c:873
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Está usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:870
+#: g10/keygen.c:879
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1514,28 +1538,28 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:883
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:879
+#: g10/keygen.c:888
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:889
+#: g10/keygen.c:898
 #, 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:890
+#: g10/keygen.c:899
 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:909
+#: g10/keygen.c:918
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:947
+#: g10/keygen.c:956
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1543,11 +1567,11 @@
 "Necesita una contraseña para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:964
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "contraseña repetida incorrecta, inténtelo de nuevo.\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:970
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1559,7 +1583,7 @@
 "la opción \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:982
+#: g10/keygen.c:991
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1572,29 +1596,29 @@
 "generador de números aleatorios mayor oportunidad de recoger suficiente\n"
 "entropía.\n"
 
-#: g10/keygen.c:1431
+#: g10/keygen.c:1440
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "El par de claves DSA tendrá 1024 bits.\n"
 
-#: g10/keygen.c:1474
+#: g10/keygen.c:1483
 msgid "Key generation canceled.\n"
 msgstr "Creación de claves cancelada.\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1581
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo certificado público en `%s'\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1582
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo certificado privado en `%s'\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1679
 msgid "public and secret key created and signed.\n"
 msgstr "Claves pública y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1684
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1603,12 +1627,12 @@
 "el comando \"--edit-key\" para crear una clave secundaria con este "
 "propósito.\n"
 
-#: g10/keygen.c:1690 g10/keygen.c:1791
+#: g10/keygen.c:1701 g10/keygen.c:1807
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creación de la clave fallida: %s\n"
 
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1748 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1616,7 +1640,7 @@
 "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1750 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1624,11 +1648,11 @@
 "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1783
 msgid "Really create? "
 msgstr "¿Crear de verdad? "
 
-#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1639,17 +1663,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr "error creando contraseña: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATENCIÓN: fichero vacío\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "leyendo desde `%s'\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrado para: %s\n"
@@ -1674,282 +1698,282 @@
 msgid "key %08lX: not protected - skipped\n"
 msgstr "clave %08lX: no es conforme a rfc2440 - ignorada\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr "ATENCIÓN: no se ha exportado nada\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:214
 msgid "too many entries in pk cache - disabled\n"
 msgstr "demasiados registros en la cache pk - anulada\n"
 
-#: g10/getkey.c:350
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+#, fuzzy
+msgid "[User id not found]"
+msgstr "%s: usuario no encontrado\n"
+
+#: g10/getkey.c:453
 msgid "too many entries in unk cache - disabled\n"
 msgstr "demasiados registros en la cache unk - anulada\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr "No puede usarse clave RSA en esta versión\n"
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
-msgstr "No hay clave para tal usuario\n"
-
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
-msgstr "No hay clave secreta para tal usuario\n"
-
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2207
 #, 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:2050
-#, fuzzy
-msgid "[User id not found]"
-msgstr "%s: usuario no encontrado\n"
+#: g10/getkey.c:2249 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/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloque de tipo %d\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 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:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "   Cantidad total procesada: %lu\n"
 
-#: g10/import.c:206
+#: g10/import.c:208
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "           nuevas subclaves: %lu\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         sin identificativo: %lu\n"
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr "                 importadas: %lu"
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                sin cambios: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "     nuevos identificativos: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nuevas subclaves: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              nuevas firmas: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "        nuevas revocaciones: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     claves secretas leídas: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " claves secretas importadas: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claves secretas sin cambios: %lu\n"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "clave %08lX: no hay identificativo de usuario\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "clave %08lX: no hay identificativos de usuario válidos\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 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:418 g10/import.c:657
+#: g10/import.c:435 g10/import.c:684
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "clave %08lX: clave pública no encontrada: %s\n"
 
-#: g10/import.c:423
+#: g10/import.c:440
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "clave %08lX: no es conforme a rfc2440 - ignorada\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "no hay anillo público por defecto\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "no puede bloquearse el anillo `%s': %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "clave %08lX: clave pública importada\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "clave %08lX: no se corresponde con nuestra copia\n"
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:489 g10/import.c:692
 #, 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:478 g10/import.c:671
+#: g10/import.c:495 g10/import.c:698
 #, 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:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "clave %08lX: 1 nuevo identificativo de usuario\n"
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "clave %08lX: %d nuevos identificativos de usuario\n"
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "clave %08lX: 1 nueva firma\n"
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "clave %08lX: %d nuevas firmas\n"
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "clave %08lX: 1 nueva subclave\n"
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "clave %08lX: %d nuevas subclaves\n"
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "clave %08lX: sin cambios\n"
 
-#: g10/import.c:613
+#: g10/import.c:610
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:640
 #, 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:617
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "clave %08lX: ya estaba en el anillo secreto\n"
 
-#: g10/import.c:622
+#: g10/import.c:649
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "clave %08lX: clave secreta no encontrada: %s\n"
 
-#: g10/import.c:651
+#: g10/import.c:678
 #, 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:682
+#: g10/import.c:709
 #, 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:714
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "clave %08lX: certificado de revocación importado\n"
 
-#: g10/import.c:756
+#: g10/import.c:783
 #, 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:763 g10/import.c:787
+#: g10/import.c:790 g10/import.c:814
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "clave %08lX: algoritmo de clave pública no soportado\n"
 
-#: g10/import.c:764
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "clave %08lX: autofirma no válida\n"
 
-#: g10/import.c:779
+#: g10/import.c:806
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "clave %08lX: no hay subclave para unir\n"
 
-#: g10/import.c:788
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "clave %08lX.%lu: unión de subclave no válida\n"
 
-#: g10/import.c:815
+#: g10/import.c:842
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "clave %08lX: aceptado ID de usuario sin autofirma '"
 
-#: g10/import.c:844
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "clave %08lX: ignorado ID de usuario '"
 
-#: g10/import.c:867
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "clave %08lX: subclave ignorada\n"
@@ -1958,99 +1982,99 @@
 #. * 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:892
+#: g10/import.c:919
 #, 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:901
+#: g10/import.c:928
 #, 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:909
+#: g10/import.c:936
 #, 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:1009
+#: g10/import.c:1036
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "clave %08lX: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:1060
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "clave %08lX: certificado de revocación añadido\n"
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "clave %08lX: nuestra copia no tiene autofirma\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: usuario no encontrado\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr "[revocación]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
 msgstr "1 firma incorrecta\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firmas incorrectas\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 firma no comprobada por falta de clave\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d firmas no comprobadas por falta de clave\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
 msgstr "1 firma no comprobada por causa de un error\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firmas no comprobadas por causa de un error\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Detectado 1 identificativo de usuario sin autofirma válida\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Detectados %d identificativos de usuario sin autofirma válida\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Ya firmada por la clave %08lX\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada que firmar con la clave %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2058,7 +2082,7 @@
 "¿Está realmente seguro de querer firmar esta clave\n"
 "con su clave: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2066,34 +2090,34 @@
 "La firma se marcará como no exportable.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "¿Firmar de verdad? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "Esta clave no está protegida.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:432
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Clave secreta no disponible"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "La clave está protegida.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No puede editarse esta clave: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2101,7 +2125,7 @@
 "Introduzca la nueva contraseña para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2109,421 +2133,425 @@
 "No ha especificado contraseña. Esto es probablemente una *mala* idea.\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "¿Realmente quiere hacer esto? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr "moviendo la firma de la clave al lugar correcto\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "sale de este menú"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr ""
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr ""
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "graba y sale"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr ""
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr ""
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr "muestra huella dactilar"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr ""
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
 msgstr "lista clave e identificativos de usuario"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr ""
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr ""
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
 msgstr "selecciona identificativo de usuario N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr ""
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "selecciona clave secundaria N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr ""
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr "lista firmas"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr ""
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr ""
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr "firma la clave"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr ""
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr ""
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
 msgstr "firma la clave localmente"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr ""
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr ""
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
 msgstr "añade un identificativo de usuario"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr ""
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
 msgstr "borra un identificativo de usuario"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr ""
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr "añade una clave secundaria"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "borra una clave secundaria"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
 msgstr "borra firmas"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr ""
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr "cambia fecha de caducidad"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr ""
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "cambia entre lista de claves secretas y públicas"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr ""
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr ""
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606 g10/keyedit.c:607
 msgid "list preferences"
 msgstr "muestra preferencias"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
+msgid "showpref"
+msgstr ""
+
+#: g10/keyedit.c:608
 msgid "passwd"
 msgstr ""
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:608
 msgid "change the passphrase"
 msgstr "cambia la contraseña"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "trust"
 msgstr ""
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revsig"
 msgstr ""
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revoke signatures"
 msgstr "revoca firmas"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revkey"
 msgstr ""
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revoke a secondary key"
 msgstr "revoca una clave secundaria"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable"
 msgstr ""
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable a key"
 msgstr "deshabilita una clave"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable"
 msgstr ""
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable a key"
 msgstr "habilita una clave"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:633
 msgid "can't do that in batchmode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:669
+#: g10/keyedit.c:671
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:700
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:781
 msgid "Really sign all user IDs? "
 msgstr "¿Firmar realmente todos los identificativos de usuario? "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:782
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugerencia: seleccione los identificativos de usuario a firmar\n"
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:814 g10/keyedit.c:1000
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "actualización de confianza fallida: %s\n"
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:825 g10/keyedit.c:846
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificativo de usuario.\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:827
 msgid "You can't delete the last user ID!\n"
 msgstr "¡No puede borrar el último identificativo de usuario!\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:830
 msgid "Really remove all selected user IDs? "
 msgstr "¿Borrar realmente todos los identificativos seleccionados? "
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:831
 msgid "Really remove this user ID? "
 msgstr "¿Borrar realmente este identificativo? "
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:867 g10/keyedit.c:889
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:871
 msgid "Do you really want to delete the selected keys? "
 msgstr "¿Borrar realmente las claves seleccionadas? "
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:872
 msgid "Do you really want to delete this key? "
 msgstr "¿Borrar realmente esta clave? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke the selected keys? "
 msgstr "¿Revocar realmente las claves seleccionadas? "
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:894
 msgid "Do you really want to revoke this key? "
 msgstr "¿Revocar realmente esta clave? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
 msgid "Save changes? "
 msgstr "¿Grabar cambios? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:967
 msgid "Quit without saving? "
 msgstr "¿Salir sin grabar? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:978
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualización fallida: %s\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:985
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualización de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:992
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualización.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1007
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando no válido (pruebe \"help\")\n"
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1090
+#: g10/keyedit.c:1140
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1144
 msgid "This key has been disabled"
 msgstr "Esta clave está deshabilitada"
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1173
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "clave %08lX: ¡esta subclave ha sido revocada!\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1176
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "        nuevas revocaciones: %lu\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1178
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1420
 msgid "Delete this good signature? (y/N/q)"
 msgstr "¿Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1424
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "¿Borrar esta firma no válida? (s/N/q)"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1428
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "¿Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1434
 msgid "Really delete this self-signature? (y/N)"
 msgstr "¿Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1448
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1449
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1452
 msgid "Nothing deleted.\n"
 msgstr "No se borró nada\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite la selección de las claves secretas.\n"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1527
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como máximo una clave secundaria.\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1531
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambiando caducidad de clave secundaria.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1575
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1591
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hay firma correspondiente en anillo secreto\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1652
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hay ningún identificativo de usuario con el índice %d\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1698
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No hay ninguna clave secundaria con el índice %d\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1796
 msgid "user ID: \""
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1799
 #, c-format
 msgid ""
 "\"\n"
@@ -2532,169 +2560,168 @@
 "\"\n"
 "firmada con su clave %08lX el %s\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1803
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "¿Crear un certificado de revocación para esta clave (s/N)?"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1827
 msgid "You have signed these user IDs:\n"
 msgstr "Ha firmado los siguientes IDs de usuario:\n"
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   firmada por %08lX el %s\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1846
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocada por %08lX el %s\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1866
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va Vd. a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1884
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "¿Crear los certificados de revocación realmente? (s/N)"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1913
 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:400 g10/mainproc.c:790
+#: g10/keylist.c:279 g10/mainproc.c:851
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "La clave caduca el %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:269
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la clave pública es %08lX\n"
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:314
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados de la clave pública: DEK bueno\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:366
 #, 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:336
+#: g10/mainproc.c:376
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "cifrado con clave %s, ID %08lX\n"
 
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr "clave secreta para descifrado no disponible\n"
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:390
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave pública fallido: %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:430
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:435
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCIÓN: ¡el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:440
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:459
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitente solicitó \"sólo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:461
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:632
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:719 g10/mainproc.c:728
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATENCIÓN: encontrados datos de notación no válidos\n"
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:731
 msgid "Notation: "
 msgstr "Notación: "
 
-#: g10/mainproc.c:680
+#: g10/mainproc.c:740
 msgid "Policy: "
 msgstr "Política: "
 
-#: g10/mainproc.c:1121
+#: g10/mainproc.c:1193
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificación de la firma\n"
 
-#: g10/mainproc.c:1158
+#. plaintext before signatures but no one-pass packets
+#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#, fuzzy
+msgid "can't handle these multiple signatures\n"
+msgstr "hace una firma separada"
+
+#: g10/mainproc.c:1256
 #, 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:1184 g10/mainproc.c:1195
+#: g10/mainproc.c:1284 g10/mainproc.c:1292
 msgid "BAD signature from \""
 msgstr "Firma INCORRECTA de \""
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1196
+#: g10/mainproc.c:1285 g10/mainproc.c:1293
 msgid "Good signature from \""
 msgstr "Firma correcta de \""
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr "también conocido como \""
 
-#: g10/mainproc.c:1243
+#: g10/mainproc.c:1358
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:1318
+#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "hace una firma separada"
+
+#: g10/mainproc.c:1454
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Clase de firma desconocida"
 
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1511
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1518
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete raíz no válido detectado en proc_tree()\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no se pueden desactivar los core dumps: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr "¡No se deberían usar algoritmos experimentales!\n"
 
-#: g10/misc.c:234
-msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
+#: g10/misc.c:238
+#, fuzzy
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
 "este algoritmo de cifrado está en desuso, considere el uso de uno más "
 "estándar.\n"
@@ -2704,12 +2731,69 @@
 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:991
+#: g10/parse-packet.c:1010
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquete de tipo %d tiene el bit crítico activado\n"
 
-#: g10/passphrase.c:159
+#: g10/passphrase.c:223
+msgid "gpg-agent is not available in this session\n"
+msgstr ""
+
+#: g10/passphrase.c:229
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr ""
+
+#: g10/hkp.c:167 g10/passphrase.c:248
+#, fuzzy, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "no puede abrirse `%s': %s\n"
+
+#: g10/passphrase.c:313 g10/passphrase.c:576
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr "(ID clave primaria %08lX)"
+
+#: g10/passphrase.c:323
+#, fuzzy, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"\n"
+"Necesita una contraseña para desbloquear la clave secreta\n"
+"del usuario: \""
+
+#: g10/passphrase.c:344
+#, fuzzy
+msgid "Enter passphrase\n"
+msgstr "Introduzca contraseña: "
+
+#: g10/passphrase.c:346
+#, fuzzy
+msgid "Repeat passphrase\n"
+msgstr "Repita contraseña: "
+
+#: g10/passphrase.c:384
+#, fuzzy
+msgid "passphrase too long\n"
+msgstr "linea demasiado larga\n"
+
+#: g10/passphrase.c:396
+msgid "invalid response from agent\n"
+msgstr ""
+
+#: g10/passphrase.c:405
+msgid "cancelled by user\n"
+msgstr ""
+
+#: g10/passphrase.c:408 g10/passphrase.c:477
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr ""
+
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2719,25 +2803,20 @@
 "Necesita una contraseña para desbloquear la clave secreta\n"
 "del usuario: \""
 
-#: g10/passphrase.c:168
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s"
 
-#: g10/passphrase.c:173
-#, c-format
-msgid " (main key ID %08lX)"
-msgstr "(ID clave primaria %08lX)"
-
-#: g10/passphrase.c:190
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
 msgstr "imposible pedir contraseña en modo de proceso por lotes\n"
 
-#: g10/passphrase.c:194
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr "Introduzca contraseña: "
 
-#: g10/passphrase.c:198
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr "Repita contraseña: "
 
@@ -2745,20 +2824,25 @@
 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:324
+#: g10/plaintext.c:332
 #, fuzzy
 msgid "Detached signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/plaintext.c:328
+#: g10/plaintext.c:336
 msgid "Please enter name of data file: "
 msgstr "Introduzca el nombre del fichero de datos: "
 
-#: g10/plaintext.c:349
+#: g10/plaintext.c:357
 msgid "reading stdin ...\n"
 msgstr "leyendo stdin...\n"
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:391
+#, fuzzy
+msgid "no signed data\n"
+msgstr "imposible abrir datos firmados `%s'\n"
+
+#: g10/plaintext.c:399
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposible abrir datos firmados `%s'\n"
@@ -2791,41 +2875,36 @@
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: clave de la firma caducada el %s\n"
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr ""
 
-#: g10/hkp.c:85
+#: g10/hkp.c:83
 #, fuzzy, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "no puede escribirse en el anillo: %s\n"
 
-#: g10/hkp.c:109 g10/hkp.c:148
+#: g10/hkp.c:102 g10/hkp.c:136
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/hkp.c:117
+#: g10/hkp.c:110
 #, 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:170
-#, fuzzy, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "no puede abrirse `%s': %s\n"
-
-#: g10/hkp.c:194
+#: g10/hkp.c:191
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:203
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:209
+#: g10/hkp.c:206
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
@@ -2869,30 +2948,35 @@
 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:324
-#, c-format
-msgid "NOTE: signature key expired %s\n"
+#: g10/sig-check.c:328
+#, fuzzy, c-format
+msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTA: clave de la firma caducada el %s\n"
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "asumiendo firma incorrecta debido a un bit crítico desconocido\n"
 
-#: g10/sign.c:140
+#: g10/sign.c:152
+#, fuzzy, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "lid %lu: lectura registro firma fallida: %s\n"
+
+#: g10/sign.c:161
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "firma %s de: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:307 g10/sign.c:630
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "no puede crearse %s: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:405
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:431
+#: g10/sign.c:448
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATENCIÓN `%s' es un fichero vacío\n"
@@ -2932,7 +3016,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: ¡el directorio no existe!\n"
 
-#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
+#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: no puede crearse: %s\n"
@@ -3114,11 +3198,6 @@
 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"
@@ -3329,14 +3408,14 @@
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "ATENCÍON: todavía no puedo tratar registros de preferencias largos\n"
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
@@ -3346,39 +3425,49 @@
 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:1374
+#: g10/ringedit.c:319 g10/ringedit.c:1376
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anillo creado\n"
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1557
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATENCIÓN: existen 2 ficheros con información confidencial.\n"
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1558
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s es el que no se ha modificado\n"
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1559
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s es el nuevo\n"
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1560
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor arregle este posible fallo de seguridad\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "clave no marcada como insegura - no puede usarse con el pseudo RNG\n"
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, fuzzy, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "`%s' ignorado: %s\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' ignorado: %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+#, fuzzy
+msgid "skipped: secret key already present\n"
+msgstr "%s: ignorado: clave pública ya presente\n"
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3406,31 +3495,31 @@
 msgid "Enter new filename"
 msgstr "Introduzca nuevo nombre de fichero"
 
-#: g10/openfile.c:182
+#: g10/openfile.c:184
 msgid "writing to stdout\n"
 msgstr "escribiendo en stdout\n"
 
-#: g10/openfile.c:261
+#: g10/openfile.c:273
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "asumiendo que hay datos firmados en `%s'\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:323
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: se ha creado un nuevo fichero de opciones\n"
 
-#: g10/openfile.c:338
+#: g10/openfile.c:350
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: no puede crearse el directorio: %s\n"
 
-#: g10/openfile.c:341
+#: g10/openfile.c:353
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: directorio creado\n"
 
-#: g10/openfile.c:343
+#: g10/openfile.c:355
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 
@@ -3450,6 +3539,11 @@
 msgstr ""
 "ATENCIÓN: mensaje cifrado con una clave débil en el cifrado simétrico.\n"
 
+#: g10/encr-data.c:97
+#, fuzzy
+msgid "problem handling encrypted packet\n"
+msgstr "elimina campo keyid de los paquetes cifrados"
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "creada clave débil - reintentando\n"
@@ -3461,14 +3555,6 @@
 "¡imposible evitar clave débil para cifrado simétrico después de %d "
 "intentos!\n"
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "¡hay una clave secreta para esta clave pública!\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr "use la opción \"--delete-secret-key\" para borrarla antes.\n"
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "imposible hacer esto en modo de proceso por lotes sin \"--yes\"\n"
@@ -3481,6 +3567,14 @@
 msgid "This is a secret key! - really delete? "
 msgstr "¡Esta es una clave secreta! ¿Eliminar realmente? "
 
+#: g10/delkey.c:181
+msgid "there is a secret key for this public key!\n"
+msgstr "¡hay una clave secreta para esta clave pública!\n"
+
+#: g10/delkey.c:183
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr "use la opción \"--delete-secret-key\" para borrarla antes.\n"
+
 #: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
@@ -3725,6 +3819,22 @@
 msgid "No help available for `%s'"
 msgstr "Ayuda no disponible para `%s'"
 
+#, fuzzy
+#~ msgid "invalid"
+#~ msgstr "Armadura no válida"
+
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "No puede usarse clave RSA en esta versión\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "No hay clave para tal usuario\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "No hay clave secreta para tal usuario\n"
+
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "clave secreta para descifrado no disponible\n"
+
 #~ msgid ""
 #~ "RSA keys are deprecated; please consider creating a new key and use this key "
 #~ "in the future\n"
@@ -3899,9 +4009,6 @@
 #~ msgid "lid %lu: read pref record failed: %s\n"
 #~ msgstr "lid %lu: lectura registro preferencias fallida: %s\n"
 
-#~ msgid "lid %lu: read sig record failed: %s\n"
-#~ msgstr "lid %lu: lectura registro firma fallida: %s\n"
-
 #~ msgid "user '%s' read problem: %s\n"
 #~ msgstr "problema de lectura usuario '%s': %s\n"
 
@@ -3920,9 +4027,6 @@
 
 #~ msgid "directory record w/o primary key\n"
 #~ msgstr "registro de directorio sin clave primaria\n"
-
-#~ msgid "line too long\n"
-#~ msgstr "linea demasiado larga\n"
 
 #~ msgid "error: missing colon\n"
 #~ msgstr "error: falta ':'\n"
diff -urN gnupg-1.0.4/po/et.po gnupg-1.0.5/po/et.po
--- gnupg-1.0.4/po/et.po	Thu Jan  1 01:00:00 1970
+++ gnupg-1.0.5/po/et.po	Sun Apr 29 16:39:25 2001
@@ -0,0 +1,3805 @@
+# Estonian translations for gnupg.
+# Copyright (C) 2001 Free Software Foundation, Inc.
+# Toomas Soome <tsoome@ut.ee>, 2000.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnupg 1.0.4\n"
+"POT-Creation-Date: 2001-04-29 16:39+0200\n"
+"PO-Revision-Date: 2001-01-04 12:01+02:00\n"
+"Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
+"Language-Team: Estonian <et@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8-bit\n"
+
+#: util/secmem.c:79
+msgid "Warning: using insecure memory!\n"
+msgstr "Hoiatus: kasutan ebaturvalist mälu!\n"
+
+#: util/secmem.c:299
+msgid "operation is not possible without initialized secure memory\n"
+msgstr "initsialiseerimata turvalise mäluta ei ole operatsioon võimalik\n"
+
+#: util/secmem.c:300
+msgid "(you may have used the wrong program for this task)\n"
+msgstr "(te kasutasite vahest selle töö jaoks valet programmi)\n"
+
+#: util/miscutil.c:287 util/miscutil.c:316
+msgid "yes"
+msgstr "jah"
+
+#: util/miscutil.c:288 util/miscutil.c:319
+msgid "yY"
+msgstr "jJ"
+
+#: util/miscutil.c:289 util/miscutil.c:317
+msgid "no"
+msgstr "ei"
+
+#: util/miscutil.c:290 util/miscutil.c:320
+msgid "nN"
+msgstr "eE"
+
+#: g10/keyedit.c:581 util/miscutil.c:318
+msgid "quit"
+msgstr "välju"
+
+#: util/miscutil.c:321
+msgid "qQ"
+msgstr "vV"
+
+#: util/errors.c:54
+msgid "general error"
+msgstr "üldine viga"
+
+#: util/errors.c:55
+msgid "unknown packet type"
+msgstr "tundmatu paketi tüüp"
+
+#: util/errors.c:56
+msgid "unknown version"
+msgstr "tundmatu versioon"
+
+#: util/errors.c:57
+msgid "unknown pubkey algorithm"
+msgstr "tundmatu avaliku võtme algoritm"
+
+#: util/errors.c:58
+msgid "unknown digest algorithm"
+msgstr "tundmatu lühendi algoritm"
+
+#: util/errors.c:59
+msgid "bad public key"
+msgstr "halb avalik võti"
+
+#: util/errors.c:60
+msgid "bad secret key"
+msgstr "halb salajane võti"
+
+#: util/errors.c:61
+msgid "bad signature"
+msgstr "halb allkiri"
+
+#: util/errors.c:62
+msgid "checksum error"
+msgstr "kontrollsumma viga"
+
+#: util/errors.c:63
+msgid "bad passphrase"
+msgstr "halb parool"
+
+#: util/errors.c:64
+msgid "public key not found"
+msgstr "ei leia avalikku võtit"
+
+#: util/errors.c:65
+msgid "unknown cipher algorithm"
+msgstr "tundmatu ¨iffri algoritm"
+
+#: util/errors.c:66
+msgid "can't open the keyring"
+msgstr "võtmehoidlat ei õnnestu avada"
+
+#: util/errors.c:67
+msgid "invalid packet"
+msgstr "vigane pakett"
+
+#: util/errors.c:68
+msgid "invalid armor"
+msgstr "vigane pakend"
+
+#: util/errors.c:69
+msgid "no such user id"
+msgstr "sellist kasutaja id pole"
+
+#: util/errors.c:70
+msgid "secret key not available"
+msgstr "salajane võti ei ole kättesaadav"
+
+#: util/errors.c:71
+msgid "wrong secret key used"
+msgstr "kasutati valet salajast võtit"
+
+#: util/errors.c:72
+msgid "not supported"
+msgstr "ei ole toetatud"
+
+#: util/errors.c:73
+msgid "bad key"
+msgstr "halb võti"
+
+#: util/errors.c:74
+msgid "file read error"
+msgstr "viga faili lugemisel"
+
+#: util/errors.c:75
+msgid "file write error"
+msgstr "viga faili kirjutamisel"
+
+#: util/errors.c:76
+msgid "unknown compress algorithm"
+msgstr "tundmatu pakkimise algoritm"
+
+#: util/errors.c:77
+msgid "file open error"
+msgstr "viga faili avamisel"
+
+#: util/errors.c:78
+msgid "file create error"
+msgstr "viga faili loomisel"
+
+#: util/errors.c:79
+msgid "invalid passphrase"
+msgstr "vigane parool"
+
+#: util/errors.c:80
+msgid "unimplemented pubkey algorithm"
+msgstr "realiseerimata avaliku võtme algoritm"
+
+#: util/errors.c:81
+msgid "unimplemented cipher algorithm"
+msgstr "realiseerimata ¨iffri algoritm"
+
+#: util/errors.c:82
+msgid "unknown signature class"
+msgstr "tundmatu allkirja klass"
+
+#: util/errors.c:83
+msgid "trust database error"
+msgstr "usalduse andmebaasi viga"
+
+#: util/errors.c:84
+msgid "bad MPI"
+msgstr "halb MPI"
+
+#: util/errors.c:85
+msgid "resource limit"
+msgstr "ressursi limiit"
+
+#: util/errors.c:86
+msgid "invalid keyring"
+msgstr "vigane võtmehoidla"
+
+#: util/errors.c:87
+msgid "bad certificate"
+msgstr "halb sertifikaat"
+
+#: util/errors.c:88
+msgid "malformed user id"
+msgstr "vigane kasutaja id"
+
+#: util/errors.c:89
+msgid "file close error"
+msgstr "viga faili sulgemisel"
+
+#: util/errors.c:90
+msgid "file rename error"
+msgstr "viga faili ümber nimetamisel"
+
+#: util/errors.c:91
+msgid "file delete error"
+msgstr "viga faili kustutamisel"
+
+#: util/errors.c:92
+msgid "unexpected data"
+msgstr "ootamatud andmed"
+
+#: util/errors.c:93
+msgid "timestamp conflict"
+msgstr "ajatemplite konflikt"
+
+#: util/errors.c:94
+msgid "unusable pubkey algorithm"
+msgstr "mittekasutatav avaliku võtme algoritm"
+
+#: util/errors.c:95
+msgid "file exists"
+msgstr "fail on olemas"
+
+#: util/errors.c:96
+msgid "weak key"
+msgstr "nõrk võti"
+
+#: util/errors.c:97
+msgid "invalid argument"
+msgstr "vigane argument"
+
+#: util/errors.c:98
+msgid "bad URI"
+msgstr "halb URI"
+
+#: util/errors.c:99
+msgid "unsupported URI"
+msgstr "mittetoetatud URI"
+
+#: util/errors.c:100
+msgid "network error"
+msgstr "võrgu viga"
+
+#: util/errors.c:102
+msgid "not encrypted"
+msgstr "krüptimata"
+
+#: util/errors.c:103
+msgid "not processed"
+msgstr "ei töödeldud"
+
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "halb avalik võti"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "halb salajane võti"
+
+#: util/logger.c:224
+#, c-format
+msgid "... this is a bug (%s:%d:%s)\n"
+msgstr "... see on viga (%s:%d:%s)\n"
+
+#: util/logger.c:230
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "te leidsite vea ... (%s:%d)\n"
+
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
+#, c-format
+msgid "can't open `%s': %s\n"
+msgstr "`%s' ei saa avada: %s\n"
+
+#: cipher/random.c:324
+#, c-format
+msgid "can't stat `%s': %s\n"
+msgstr "ei õnnestu lugeda `%s' atribuute: %s\n"
+
+#: cipher/random.c:329
+#, c-format
+msgid "`%s' is not a regular file - ignored\n"
+msgstr "`%s' ei ole tavaline fail - ignoreerin\n"
+
+#: cipher/random.c:334
+msgid "note: random_seed file is empty\n"
+msgstr "märkus: random_seed fail on tühi\n"
+
+#: cipher/random.c:340
+msgid "warning: invalid size of random_seed file - not used\n"
+msgstr "hoiatus: vigane random_seed faili suurus - ei kasuta\n"
+
+#: cipher/random.c:348
+#, c-format
+msgid "can't read `%s': %s\n"
+msgstr "`%s' ei saa lugeda: %s\n"
+
+#: cipher/random.c:386
+msgid "note: random_seed file not updated\n"
+msgstr "märkus: random_seed faili ei uuendatud\n"
+
+#: cipher/random.c:406
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "`%s' ei saa luua: %s\n"
+
+#: cipher/random.c:413
+#, c-format
+msgid "can't write `%s': %s\n"
+msgstr "`%s' ei saa kirjutada: %s\n"
+
+#: cipher/random.c:416
+#, c-format
+msgid "can't close `%s': %s\n"
+msgstr "`%s' ei saa sulgeda: %s\n"
+
+#: cipher/random.c:427
+#, c-format
+msgid "too many random bits requested; the limit is %d\n"
+msgstr "sooviti liiga palju juhuslikke bitte; piirang on %d\n"
+
+#: cipher/random.c:661
+msgid "WARNING: using insecure random number generator!!\n"
+msgstr "HOIATUS: kasutan ebaturvalist juhuarvude generaatorit!!\n"
+
+#: cipher/random.c:662
+msgid ""
+"The random number generator is only a kludge to let\n"
+"it run - it is in no way a strong RNG!\n"
+"\n"
+"DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
+"\n"
+msgstr ""
+"Juhuarvude generaator on ainult tühi kest, et programmid\n"
+"käiks - see EI OLE tugev juhuargude generaator!\n"
+"\n"
+"ÄRGE KASUTAGE SELLE PROGRAMMI PIILT GENEREERITUD ANDMEID!!\n"
+"\n"
+
+#: cipher/rndlinux.c:142
+#, c-format
+msgid ""
+"\n"
+"Not enough random bytes available.  Please do some other work to give\n"
+"the OS a chance to collect more entropy! (Need %d more bytes)\n"
+msgstr ""
+"\n"
+"Juhuslikke baite ei ole piisavalt. Palun tehke arvutiga muid töid,\n"
+"et anda masinal võimalust koguda enam entroopiat! (Vajatakse %d baiti)\n"
+
+#: g10/g10.c:216
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Käsud:\n"
+" "
+
+#: g10/g10.c:218
+msgid "|[file]|make a signature"
+msgstr "|[fail]|loo allkiri"
+
+#: g10/g10.c:219
+msgid "|[file]|make a clear text signature"
+msgstr "|[fail]|loo avateksti allkiri"
+
+#: g10/g10.c:220
+msgid "make a detached signature"
+msgstr "loo eraldiseisev allkiri"
+
+#: g10/g10.c:221
+msgid "encrypt data"
+msgstr "krüpti andmed"
+
+#: g10/g10.c:222
+msgid "encryption only with symmetric cipher"
+msgstr "krüptimine kasutades sümmeetrilist ¨iffrit"
+
+#: g10/g10.c:223
+msgid "store only"
+msgstr "salvesta ainult"
+
+#: g10/g10.c:224
+msgid "decrypt data (default)"
+msgstr "dekrüpti andmed (vaikimisi)"
+
+#: g10/g10.c:225
+msgid "verify a signature"
+msgstr "kontrolli allkirja"
+
+#: g10/g10.c:227
+msgid "list keys"
+msgstr "näita võtmeid"
+
+#: g10/g10.c:229
+msgid "list keys and signatures"
+msgstr "näita võtmeid ja allkirju"
+
+#: g10/g10.c:230
+msgid "check key signatures"
+msgstr "kontrolli võtmete allkirju"
+
+#: g10/g10.c:231
+msgid "list keys and fingerprints"
+msgstr "näita võtmeid ja sõrmejälgi"
+
+#: g10/g10.c:232
+msgid "list secret keys"
+msgstr "näita salajasi võtmeid"
+
+#: g10/g10.c:233
+msgid "generate a new key pair"
+msgstr "genereeri uus võtmepaar"
+
+#: g10/g10.c:234
+msgid "remove key from the public keyring"
+msgstr "eemalda võti avalike võtmete hoidlast"
+
+#: g10/g10.c:236
+msgid "remove key from the secret keyring"
+msgstr "eemalda võti salajaste võtmete hoidlast"
+
+#: g10/g10.c:237
+msgid "sign a key"
+msgstr "allkirjasta võti"
+
+#: g10/g10.c:238
+msgid "sign a key locally"
+msgstr "allkirjasta võti lokaalselt"
+
+#: g10/g10.c:239
+msgid "sign or edit a key"
+msgstr "allkirjasta või toimeta võtit"
+
+#: g10/g10.c:240
+msgid "generate a revocation certificate"
+msgstr "genereeri tühistamise sertifikaat"
+
+#: g10/g10.c:241
+msgid "export keys"
+msgstr "ekspordi võtmed"
+
+#: g10/g10.c:242
+msgid "export keys to a key server"
+msgstr "ekspordi võtmed võtmeserverisse"
+
+#: g10/g10.c:243
+msgid "import keys from a key server"
+msgstr "impordi võtmed võtmeserverist"
+
+#: g10/g10.c:247
+msgid "import/merge keys"
+msgstr "impordi/mesti võtmed"
+
+#: g10/g10.c:249
+msgid "list only the sequence of packets"
+msgstr "näita ainult pakettide järjendeid"
+
+#: g10/g10.c:251
+msgid "export the ownertrust values"
+msgstr "ekspordi usalduse väärtused"
+
+#: g10/g10.c:253
+msgid "import ownertrust values"
+msgstr "impordi usalduse väärtused"
+
+#: g10/g10.c:255
+msgid "update the trust database"
+msgstr "uuenda usalduse andmebaasi"
+
+#: g10/g10.c:257
+msgid "|[NAMES]|check the trust database"
+msgstr "|[NIMED]|kontrolli usalduse andmebaasi"
+
+#: g10/g10.c:258
+msgid "fix a corrupted trust database"
+msgstr "paranda vigane usalduse andmebaas"
+
+#: g10/g10.c:259
+msgid "De-Armor a file or stdin"
+msgstr "Pakenda fail või standardsisend lahti"
+
+#: g10/g10.c:261
+msgid "En-Armor a file or stdin"
+msgstr "Pakenda fail või standardsisend"
+
+#: g10/g10.c:263
+msgid "|algo [files]|print message digests"
+msgstr "|algo [failid]|trüki teatelühendid"
+
+#: g10/g10.c:267
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Võtmed:\n"
+" "
+
+#: g10/g10.c:269
+msgid "create ascii armored output"
+msgstr "loo ascii pakendis väljund"
+
+#: g10/g10.c:271
+msgid "|NAME|encrypt for NAME"
+msgstr "|NIMI|krüpti NIMEle"
+
+#: g10/g10.c:274
+msgid "|NAME|use NAME as default recipient"
+msgstr "|NIMI|kasuta NIME vaikimisi saajana"
+
+#: g10/g10.c:276
+msgid "use the default key as default recipient"
+msgstr "kasuta vaikimisi saajana vaikimisi võtit"
+
+#: g10/g10.c:280
+msgid "use this user-id to sign or decrypt"
+msgstr "kasuta seda kasutaja IDd"
+
+#: g10/g10.c:281
+msgid "|N|set compress level N (0 disables)"
+msgstr "|N|määra pakkimise tase N (0 blokeerib)"
+
+#: g10/g10.c:283
+msgid "use canonical text mode"
+msgstr "kasuta kanoonilist tekstimoodi"
+
+#: g10/g10.c:284
+msgid "use as output file"
+msgstr "kasuta väljundfailina"
+
+#: g10/g10.c:285
+msgid "verbose"
+msgstr "ole jutukas"
+
+#: g10/g10.c:286
+msgid "be somewhat more quiet"
+msgstr "ole mõnevõrra vaiksem"
+
+#: g10/g10.c:287
+msgid "don't use the terminal at all"
+msgstr "ära kasuta terminali"
+
+#: g10/g10.c:288
+msgid "force v3 signatures"
+msgstr "kasuta v3 allkirju"
+
+#: g10/g10.c:289
+msgid "always use a MDC for encryption"
+msgstr "krüptimisel kasuta alati MDC"
+
+#: g10/g10.c:290
+msgid "do not make any changes"
+msgstr "ära tee mingeid muutuseid"
+
+#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
+#: g10/g10.c:292
+msgid "use the gpg-agent"
+msgstr ""
+
+#: g10/g10.c:293
+msgid "batch mode: never ask"
+msgstr "pakettmood: ära küsi kunagi"
+
+#: g10/g10.c:294
+msgid "assume yes on most questions"
+msgstr "eelda enamus küsimustele jah vastust"
+
+#: g10/g10.c:295
+msgid "assume no on most questions"
+msgstr "eelda enamus küsimustele ei vastust"
+
+#: g10/g10.c:296
+msgid "add this keyring to the list of keyrings"
+msgstr "lisa see võtmehoidla võtmehoidlate nimekirja"
+
+#: g10/g10.c:297
+msgid "add this secret keyring to the list"
+msgstr "lisa see salajaste võtmete hoidla nimekirja"
+
+#: g10/g10.c:298
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
+
+#: g10/g10.c:299
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr "|HOST|kasuta seda võtmeserverit"
+
+#: g10/g10.c:300
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|NIMI|terminali kooditabel on NIMI"
+
+#: g10/g10.c:301
+msgid "read options from file"
+msgstr "loe võtmed failist"
+
+#: g10/g10.c:305
+msgid "|FD|write status info to this FD"
+msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
+
+#: g10/g10.c:310
+msgid "|KEYID|ulimately trust this key"
+msgstr "|VÕTMEID|usalda seda võtit täielikult"
+
+#: g10/g10.c:311
+msgid "|FILE|load extension module FILE"
+msgstr "|FAIL|lae laiendusmoodul FAIL"
+
+#: g10/g10.c:312
+msgid "emulate the mode described in RFC1991"
+msgstr "emuleeri dokumendis RFC1991 kirjeldatud moodi"
+
+#: g10/g10.c:313
+msgid "set all packet, cipher and digest options to OpenPGP behavior"
+msgstr "kasuta kõikides tegevustes OpenPGP võtmeid"
+
+#: g10/g10.c:314
+msgid "|N|use passphrase mode N"
+msgstr "|N|kasuta parooli moodi N"
+
+#: g10/g10.c:316
+msgid "|NAME|use message digest algorithm NAME for passphrases"
+msgstr "|NIMI|kasuta paroolidega lühendialgoritmi NIMI"
+
+#: g10/g10.c:318
+msgid "|NAME|use cipher algorithm NAME for passphrases"
+msgstr "|NIMI|kasuta paroolidega ¨iffri algoritmi NIMI"
+
+#: g10/g10.c:319
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NIMI|kasuta ¨iffri algoritmi NIMI"
+
+#: g10/g10.c:320
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NIMI|kasuta teatelühendi algoritmi NIMI"
+
+#: g10/g10.c:321
+msgid "|N|use compress algorithm N"
+msgstr "|N|kasuta pakkimisalgoritmi N"
+
+#: g10/g10.c:322
+msgid "throw keyid field of encrypted packets"
+msgstr "ära lisa krüptimisel võtme id"
+
+#: g10/g10.c:323
+msgid "|NAME=VALUE|use this notation data"
+msgstr "|NIMI=VÄÄRTUS|kasuta neid noteerimise andmeid"
+
+#: g10/g10.c:326
+msgid ""
+"@\n"
+"(See the man page for a complete listing of all commands and options)\n"
+msgstr ""
+"@\n"
+"(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n"
+
+#: g10/g10.c:329
+msgid ""
+"@\n"
+"Examples:\n"
+"\n"
+" -se -r Bob [file]          sign and encrypt for user Bob\n"
+" --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"
+msgstr ""
+"@\n"
+"Näited:\n"
+"\n"
+" -se -r Bob [fail]          allkirjasta ja krüpti kasutajale Bob\n"
+" --clearsign [fail]         loo avateksti allkiri\n"
+" --detach-sign [fail]       loo eraldiseisev allkiri\n"
+" --list-keys [nimed]        näita võtmeid\n"
+" --fingerprint [nimed]      näita sõrmejälgi\n"
+
+#: g10/g10.c:438
+msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
+msgstr "Palun saatke veateated aadressil <gnupg-bugs@gnu.org>.\n"
+
+#: g10/g10.c:442
+msgid "Usage: gpg [options] [files] (-h for help)"
+msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
+
+#: g10/g10.c:445
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"sign, check, encrypt or decrypt\n"
+"default operation depends on the input data\n"
+msgstr ""
+"Süntaks: gpg [võtmed] [failid]\n"
+"allkirjasta, kontrolli, krüpti ja dekrüpti\n"
+"vaikimisi operatsioon sõltub sisendandmetest\n"
+
+#: g10/g10.c:452
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"Toetatud algoritmid:\n"
+
+#: g10/g10.c:531
+msgid "usage: gpg [options] "
+msgstr "kasuta: gpg [võtmed] "
+
+#: g10/g10.c:584
+msgid "conflicting commands\n"
+msgstr "konfliktsed käsud\n"
+
+#: g10/g10.c:734
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "MÄRKUS: vaikimisi võtmete fail `%s' puudub\n"
+
+#: g10/g10.c:738
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "võtmete fail `%s': %s\n"
+
+#: g10/g10.c:745
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "loen võtmeid failist `%s'\n"
+
+#: g10/g10.c:950
+#, c-format
+msgid "%s is not a valid character set\n"
+msgstr "%s ei ole lubatud kooditabel\n"
+
+#: g10/g10.c:1024
+msgid "WARNING: program may create a core file!\n"
+msgstr "HOIATUS: programm võib salvestada oma mälupildi!\n"
+
+#: g10/g10.c:1028 g10/g10.c:1037
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "MÄRKUS: %s ei ole tavapäraseks kasutamiseks!\n"
+
+#: g10/g10.c:1030
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s ja %s ei ole koos lubatud!\n"
+
+#: g10/g10.c:1033
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s ja %s ei oma koos mõtet!\n"
+
+#: g10/g10.c:1053 g10/g10.c:1065
+msgid "selected cipher algorithm is invalid\n"
+msgstr "valitud ¨iffri algoritm ei ole lubatud\n"
+
+#: g10/g10.c:1059 g10/g10.c:1071
+msgid "selected digest algorithm is invalid\n"
+msgstr "valitud lühendi algoritm ei ole lubatud\n"
+
+#: g10/g10.c:1075
+msgid "the given policy URL is invalid\n"
+msgstr "anti vigane poliisi URL\n"
+
+#: g10/g10.c:1078
+#, c-format
+msgid "compress algorithm must be in range %d..%d\n"
+msgstr "pakkimise algoritm peab olema vahemikust %d..%d\n"
+
+#: g10/g10.c:1080
+msgid "completes-needed must be greater than 0\n"
+msgstr "completes-needed peab olema suurem, kui 0\n"
+
+#: g10/g10.c:1082
+msgid "marginals-needed must be greater than 1\n"
+msgstr "marginals-needed peab olema suurem, kui 1\n"
+
+#: g10/g10.c:1084
+msgid "max-cert-depth must be in range 1 to 255\n"
+msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
+
+#: g10/g10.c:1087
+msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
+msgstr "MÄRKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
+
+#: g10/g10.c:1091
+msgid "invalid S2K mode; must be 0, 1 or 3\n"
+msgstr "vigane S2K mood; peab olema 0, 1 või 3\n"
+
+#: g10/g10.c:1176
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
+
+#: g10/g10.c:1182
+msgid "--store [filename]"
+msgstr "--store [failinimi]"
+
+#: g10/g10.c:1189
+msgid "--symmetric [filename]"
+msgstr "--symmetric [failinimi]"
+
+#: g10/g10.c:1197
+msgid "--encrypt [filename]"
+msgstr "--encrypt [failinimi]"
+
+#: g10/g10.c:1210
+msgid "--sign [filename]"
+msgstr "--sign [failinimi]"
+
+#: g10/g10.c:1223
+msgid "--sign --encrypt [filename]"
+msgstr "--sign --encrypt [failinimi]"
+
+#: g10/g10.c:1237
+msgid "--clearsign [filename]"
+msgstr "--clearsign [failinimi]"
+
+#: g10/g10.c:1254
+msgid "--decrypt [filename]"
+msgstr "--decrypt [failinimi]"
+
+#: g10/g10.c:1262
+msgid "--sign-key user-id"
+msgstr "--sign-key kasutaja-id"
+
+#: g10/g10.c:1270
+msgid "--lsign-key user-id"
+msgstr "--lsign-key kasutaja-id"
+
+#: g10/g10.c:1278
+msgid "--edit-key user-id [commands]"
+msgstr "--edit-key kasutaja-id [käsud]"
+
+#: g10/g10.c:1294
+msgid "--delete-secret-key user-id"
+msgstr "--delete-secret-key kasutaja-id"
+
+#: g10/g10.c:1297
+msgid "--delete-key user-id"
+msgstr "--delete-key kasutaja-id"
+
+#: g10/g10.c:1305
+#, fuzzy
+msgid "--delete-secret-and-public-key user-id"
+msgstr "--delete-secret-key kasutaja-id"
+
+#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "%s ei saa avada: %s\n"
+
+#: g10/g10.c:1357
+msgid "-k[v][v][v][c] [user-id] [keyring]"
+msgstr "-k[v][v][v][c] [kasutaja-id] [võtmehoidla]"
+
+#: g10/g10.c:1423
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "lahtipakendamine ebaõnnestus: %s\n"
+
+#: g10/g10.c:1431
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "pakendamine ebaõnnestus: %s\n"
+
+#: g10/g10.c:1502
+#, c-format
+msgid "invalid hash algorithm `%s'\n"
+msgstr "vigane teatelühendi algoritm `%s'\n"
+
+#: g10/g10.c:1589
+msgid "[filename]"
+msgstr "[failinimi]"
+
+#: g10/g10.c:1593
+msgid "Go ahead and type your message ...\n"
+msgstr "Kirjutage nüüd oma teade ...\n"
+
+#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
+#, c-format
+msgid "can't open `%s'\n"
+msgstr "`%s' ei saa avada\n"
+
+#: g10/g10.c:1805
+msgid ""
+"the first character of a notation name must be a letter or an underscore\n"
+msgstr "esimene sümbol noteerimise nimes peab olema täht või alakriips\n"
+
+#: g10/g10.c:1811
+msgid ""
+"a notation name must have only letters, digits, dots or underscores and end "
+"with an '='\n"
+msgstr ""
+"noteerimise nimes võivad olla ainult tähed, numbrid, punktid ja alakriipsud\n"
+"ning lõpus peab olema '='\n"
+
+#: g10/g10.c:1817
+msgid "dots in a notation name must be surrounded by other characters\n"
+msgstr ""
+"punktid noteerimise nimes peavad olema ümbritsetud teiste sümbolitega\n"
+
+#: g10/g10.c:1825
+msgid "a notation value must not use any control characters\n"
+msgstr "noteerimise väärtus ei või sisaldada kontroll sümboleid\n"
+
+#: g10/armor.c:306
+#, c-format
+msgid "armor: %s\n"
+msgstr "pakend: %s\n"
+
+#: g10/armor.c:335
+msgid "invalid armor header: "
+msgstr "vigane pakendi päis: "
+
+#: g10/armor.c:342
+msgid "armor header: "
+msgstr "pakendi päis: "
+
+#: g10/armor.c:353
+msgid "invalid clearsig header\n"
+msgstr "vigane avateksti allkirja päis\n"
+
+#: g10/armor.c:405
+msgid "nested clear text signatures\n"
+msgstr "avateksti allkirjad üksteise sees\n"
+
+#: g10/armor.c:529
+msgid "invalid dash escaped line: "
+msgstr "vigane kriipsudega märgitud rida: "
+
+#: g10/armor.c:541
+msgid "unexpected armor:"
+msgstr "ootamatu pakend:"
+
+#: g10/armor.c:667 g10/armor.c:1235
+#, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "jätsin vigase radix64 sümboli %02x vahele\n"
+
+#: g10/armor.c:710
+msgid "premature eof (no CRC)\n"
+msgstr "enneaegne faililõpp (puudub CRC)\n"
+
+#: g10/armor.c:744
+msgid "premature eof (in CRC)\n"
+msgstr "enneaegne faililõpp (poolik CRC)\n"
+
+#: g10/armor.c:748
+msgid "malformed CRC\n"
+msgstr "vigane CRC\n"
+
+#: g10/armor.c:752 g10/armor.c:1272
+#, c-format
+msgid "CRC error; %06lx - %06lx\n"
+msgstr "CRC viga; %06lx - %06lx\n"
+
+#: g10/armor.c:772
+msgid "premature eof (in Trailer)\n"
+msgstr "enneaegne faililõpp (lõpetaval real)\n"
+
+#: g10/armor.c:776
+msgid "error in trailer line\n"
+msgstr "viga lõpetaval real\n"
+
+#: g10/armor.c:922
+msgid "For info see http://www.gnupg.org"
+msgstr "Infot saate lehelt http://www.gnupg.org"
+
+#: g10/armor.c:1050
+msgid "no valid OpenPGP data found.\n"
+msgstr "OpenPGP andmeid pole.\n"
+
+#: g10/armor.c:1055
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr "vigane pakend: rida on pikem, kui %d sümbolit\n"
+
+#: g10/armor.c:1059
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
+msgstr ""
+"kvooditud sümbol pakendis - tõenäoliselt on kasutatud vigast MTA programmi\n"
+
+#. Translators: this shoud fit into 24 bytes to that the fingerprint
+#. * data is properly aligned with the user ID
+#: g10/keyedit.c:1243 g10/pkclist.c:53
+msgid "             Fingerprint:"
+msgstr "               Sõrmejälg:"
+
+#: g10/pkclist.c:80
+msgid "Fingerprint:"
+msgstr "Sõrmejälg:"
+
+#: g10/pkclist.c:116
+msgid "No reason specified"
+msgstr "Põhjus puudub"
+
+#: g10/pkclist.c:118
+msgid "Key is superseded"
+msgstr "Võti on asendatud"
+
+#: g10/pkclist.c:120
+msgid "Key has been compromised"
+msgstr "Võti on kompromiteeritud"
+
+#: g10/pkclist.c:122
+msgid "Key is no longer used"
+msgstr "Võti ei ole enam kasutusel"
+
+#: g10/pkclist.c:124
+msgid "User ID is no longer valid"
+msgstr "Kasutaja ID ei ole enam kehtiv"
+
+#: g10/pkclist.c:128
+msgid "Reason for revocation: "
+msgstr "Tühistamise põhjus: "
+
+#: g10/pkclist.c:145
+msgid "Revocation comment: "
+msgstr "Tühistamise kommentaar: "
+
+#. a string with valid answers
+#: g10/pkclist.c:303
+msgid "sSmMqQ"
+msgstr "iImMvV"
+
+#: g10/pkclist.c:307
+#, c-format
+msgid ""
+"No trust value assigned to %lu:\n"
+"%4u%c/%08lX %s \""
+msgstr ""
+"%lu usalduse väärtus puudub:\n"
+"%4u%c/%08lX %s \""
+
+#: g10/pkclist.c:319
+msgid ""
+"Please decide how far you trust this user to correctly\n"
+"verify other users' keys (by looking at passports,\n"
+"checking fingerprints from different sources...)?\n"
+"\n"
+" 1 = Don't know\n"
+" 2 = I do NOT trust\n"
+" 3 = I trust marginally\n"
+" 4 = I trust fully\n"
+" s = please show me more information\n"
+msgstr ""
+"Palun otsustage, kuivõrd te usaldate seda kasutajat\n"
+"teiste kasutajate võtmete kontrollimisel.\n"
+"\n"
+" 1 = Ma ei tea\n"
+" 2 = Ma EI usalda\n"
+" 3 = Ma usaldan mõneti\n"
+" 4 = Ma usaldan täiesti\n"
+" i = palun näita mulle veel informatsiooni\n"
+
+#: g10/pkclist.c:328
+msgid " m = back to the main menu\n"
+msgstr " m = tagasi põhimenüüsse\n"
+
+#: g10/pkclist.c:330
+msgid " q = quit\n"
+msgstr " v = välju\n"
+
+#: g10/pkclist.c:336
+msgid "Your decision? "
+msgstr "Teie otsus? "
+
+#: g10/pkclist.c:358
+msgid "Certificates leading to an ultimately trusted key:\n"
+msgstr "Sertifikaadid täiesti usaldatava võtmeni:\n"
+
+#: g10/pkclist.c:429
+msgid ""
+"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"
+msgstr ""
+"Ei leia kehtivat usaldusteed teie võtmeni. Vaatame, kas on\n"
+"võimalik lisada mõni puuduv usalduse väärtus.\n"
+"\n"
+
+#: g10/pkclist.c:435
+msgid ""
+"No path leading to one of our keys found.\n"
+"\n"
+msgstr ""
+"Ei leia teed ühe meie võtmeni.\n"
+"\n"
+
+#: g10/pkclist.c:437
+msgid ""
+"No certificates with undefined trust found.\n"
+"\n"
+msgstr ""
+"Määramata usalduseväärtusega sertifikaate pole.\n"
+"\n"
+
+#: g10/pkclist.c:439
+msgid ""
+"No trust values changed.\n"
+"\n"
+msgstr ""
+"Usalduse väärtust ei muudetud.\n"
+"\n"
+
+#: g10/pkclist.c:457
+#, c-format
+msgid "key %08lX: key has been revoked!\n"
+msgstr "võti %08lX: võti on tühistatud!\n"
+
+#: g10/pkclist.c:464 g10/pkclist.c:476 g10/pkclist.c:598
+msgid "Use this key anyway? "
+msgstr "Kasutan seda võtit ikka? "
+
+#: g10/pkclist.c:469
+#, c-format
+msgid "key %08lX: subkey has been revoked!\n"
+msgstr "võti %08lX: alamvõti on tühistatud!\n"
+
+#: g10/pkclist.c:512
+#, c-format
+msgid "%08lX: key has expired\n"
+msgstr "%08lX: võti on aegunud\n"
+
+#: g10/pkclist.c:518
+#, c-format
+msgid "%08lX: no info to calculate a trust probability\n"
+msgstr "%08lX: usaldusväärsuse arvutamiseks napib infot\n"
+
+#: g10/pkclist.c:533
+#, c-format
+msgid "%08lX: We do NOT trust this key\n"
+msgstr "%08lX: Me EI usalda seda võtit\n"
+
+#: g10/pkclist.c:539
+#, c-format
+msgid ""
+"%08lX: It is not sure that this key really belongs to the owner\n"
+"but it is accepted anyway\n"
+msgstr ""
+"%08lX: Ei ole kindel, et see võti tõesti kuulub omanikule,\n"
+"aktsepteerime seda siiski\n"
+
+#: g10/pkclist.c:545
+msgid "This key probably belongs to the owner\n"
+msgstr "See võti kuulub ilmselt omanikule\n"
+
+#: g10/pkclist.c:550
+msgid "This key belongs to us\n"
+msgstr "See võti kuulub meile\n"
+
+#: g10/pkclist.c:593
+msgid ""
+"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"
+msgstr ""
+"EI ole kindel, et see võti kuulub tema omanikule.\n"
+"Kui te *tõesti* teate, mida te teete, võite järgnevale\n"
+"küsimusele vastata jaatavalt\n"
+"\n"
+
+#: g10/pkclist.c:607 g10/pkclist.c:630
+msgid "WARNING: Using untrusted key!\n"
+msgstr "HOIATUS: Kasutan mitteusaldatavat võtit!\n"
+
+#: g10/pkclist.c:651
+msgid "WARNING: This key has been revoked by its owner!\n"
+msgstr "HOIATUS: See võti on omaniku poolt tühistatud!\n"
+
+#: g10/pkclist.c:652
+msgid "         This could mean that the signature is forgery.\n"
+msgstr "         See võib tähendada, et allkiri on võltsing.\n"
+
+#: g10/pkclist.c:657
+msgid "WARNING: This subkey has been revoked by its owner!\n"
+msgstr "HOIATUS: See alamvõti on omaniku poolt tühistatud!\n"
+
+#: g10/pkclist.c:679
+msgid "Note: This key has expired!\n"
+msgstr "Märkus: See võti on aegunud!\n"
+
+#: g10/pkclist.c:687
+msgid "WARNING: This key is not certified with a trusted signature!\n"
+msgstr "HOIATUS: seda võtit ei ole sertifitseeritud usaldatava allkirjaga\n"
+
+#: g10/pkclist.c:689
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
+msgstr "         Ei ole midagi, mis näitaks, et allkiri kuulub omanikule.\n"
+
+#: g10/pkclist.c:706
+msgid "WARNING: We do NOT trust this key!\n"
+msgstr "HOIATUS: Me EI usalda seda võtit!\n"
+
+#: g10/pkclist.c:707
+msgid "         The signature is probably a FORGERY.\n"
+msgstr "         Allkiri on tõenäoliselt VÕLTSING.\n"
+
+#: g10/pkclist.c:714
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgstr ""
+"HOIATUS: Seda võtit ei ole sertifitseerinud piisavalt usaldatav allkiri!\n"
+
+#: g10/pkclist.c:717
+msgid "         It is not certain that the signature belongs to the owner.\n"
+msgstr "         Ei ole kindel, et allkiri kuulub omanikule.\n"
+
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
+#, c-format
+msgid "%s: skipped: %s\n"
+msgstr "%s: jätsin vahele: %s\n"
+
+#: g10/pkclist.c:826 g10/pkclist.c:993
+#, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: jätsin vahele: avalik võti on juba olemas\n"
+
+#: g10/pkclist.c:853
+msgid ""
+"You did not specify a user ID. (you may use \"-r\")\n"
+"\n"
+msgstr ""
+"Te ei määranud kasutaja IDd. (te võite kasutada võtit \"-r\")\n"
+"\n"
+
+#: g10/pkclist.c:863
+msgid "Enter the user ID: "
+msgstr "Sisestage kasutaja ID: "
+
+#: g10/pkclist.c:875
+msgid "No such user ID.\n"
+msgstr "Sellist kasutaja ID pole.\n"
+
+#: g10/pkclist.c:880
+msgid "skipped: public key already set as default recipient\n"
+msgstr "jätsin vahele: avalik võti on juba vaikimisi saaja\n"
+
+#: g10/pkclist.c:903
+msgid "Public key is disabled.\n"
+msgstr "Avalik võti on blokeeritud.\n"
+
+#: g10/pkclist.c:910
+msgid "skipped: public key already set with --encrypt-to\n"
+msgstr "jätsin vahele: avalik võti on juba seatud võtmega --encrypt-to\n"
+
+#: g10/pkclist.c:941
+#, c-format
+msgid "unknown default recipient `%s'\n"
+msgstr "tundmatu vaikimisi saaja `%s'\n"
+
+#: g10/pkclist.c:974
+#, c-format
+msgid "%s: error checking key: %s\n"
+msgstr "%s: viga võtme kontrollimisel: %s\n"
+
+#: g10/pkclist.c:979
+#, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr "%s: jätsin vahele: avalik võti on blokeeritud\n"
+
+#: g10/pkclist.c:1017
+msgid "no valid addressees\n"
+msgstr "kehtivaid aadresse pole\n"
+
+#: g10/keygen.c:176
+msgid "writing self signature\n"
+msgstr "kirjutan iseenda allkirja\n"
+
+#: g10/keygen.c:217
+msgid "writing key binding signature\n"
+msgstr "kirjutan võtit siduva allkirja\n"
+
+#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
+#, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr "vigane võtme suurus; kasutan %u bitti\n"
+
+#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
+#, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr "võtme suurus ümardatud üles %u bitini\n"
+
+#: g10/keygen.c:549
+msgid "Please select what kind of key you want:\n"
+msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
+
+#: g10/keygen.c:551
+#, c-format
+msgid "   (%d) DSA and ElGamal (default)\n"
+msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
+
+#: g10/keygen.c:552
+#, c-format
+msgid "   (%d) DSA (sign only)\n"
+msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
+
+#: g10/keygen.c:554
+#, c-format
+msgid "   (%d) ElGamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (ainult krüptimiseks)\n"
+
+#: g10/keygen.c:555
+#, c-format
+msgid "   (%d) ElGamal (sign and encrypt)\n"
+msgstr "   (%d) ElGamal (allkirjastamiseks ja krüptimiseks)\n"
+
+#: g10/keygen.c:557
+#, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) RSA (allkirjastamiseks ja krüptimiseks)\n"
+
+#: g10/keygen.c:561
+msgid "Your selection? "
+msgstr "Teie valik? "
+
+#: g10/keygen.c:572
+msgid "Do you really want to create a sign and encrypt key? "
+msgstr "Kas te soovite tõesti luua allkirjastamise ja krüptimise võtit? "
+
+#: g10/keygen.c:580
+msgid "The use of this algorithm is deprecated - create anyway? "
+msgstr ""
+
+#: g10/keygen.c:594
+msgid "Invalid selection.\n"
+msgstr "Vigane valik.\n"
+
+#: g10/keygen.c:606
+#, c-format
+msgid ""
+"About to generate a new %s keypair.\n"
+"              minimum keysize is  768 bits\n"
+"              default keysize is 1024 bits\n"
+"    highest suggested keysize is 2048 bits\n"
+msgstr ""
+"Enne uue %s võtmepaari genereerimist.\n"
+"           minimaalne võtmepikkus on  768 bitti\n"
+"            vaikimisi võtmepikkus on 1024 bitti\n"
+"    suurim soovitatav võtmepikkus on 2048 bitti\n"
+
+#: g10/keygen.c:613
+msgid "What keysize do you want? (1024) "
+msgstr "Millist võtmepikkust te soovite? (1024) "
+
+#: g10/keygen.c:618
+msgid "DSA only allows keysizes from 512 to 1024\n"
+msgstr "DSA lubab võtmepikkuseid ainult alates 512 kuni 1024\n"
+
+#: g10/keygen.c:620
+msgid "keysize too small; 768 is smallest value allowed.\n"
+msgstr "võtmepikkus on liiga väike; 768 on väikseim lubatud väärtus.\n"
+
+#: g10/keygen.c:622
+msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+msgstr "võtmepikkus on liiga väike; RSA korral on väikseim väärtus 1024.\n"
+
+#. It is ridiculous and an annoyance to use larger key sizes!
+#. * GnuPG can handle much larger sizes; but it takes an eternity
+#. * to create such a key (but less than the time the Sirius
+#. * Computer Corporation needs to process one of the usual
+#. * complaints) and {de,en}cryption although needs some time.
+#. * 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:633
+#, c-format
+msgid "keysize too large; %d is largest value allowed.\n"
+msgstr "võrmepikkus on liiga suur; suurim lubatud väärtus on %d.\n"
+
+#: g10/keygen.c:638
+msgid ""
+"Keysizes larger than 2048 are not suggested because\n"
+"computations take REALLY long!\n"
+msgstr ""
+"Suuremad võtmepikkused kui 2048 ei ole soovitatavad, kuna\n"
+"arvutused võtavad VÄGA palju aega!\n"
+
+#: g10/keygen.c:641
+msgid "Are you sure that you want this keysize? "
+msgstr "Olete kindel, et soovite sellist võtmepikkust? "
+
+#: g10/keygen.c:642
+msgid ""
+"Okay, but keep in mind that your monitor and keyboard radiation is also very "
+"vulnerable to attacks!\n"
+msgstr ""
+"Olgu, kuid pidage meeles, et ka teie monitor ja klaviatuur on samuti\n"
+"võimalikud ründeobjektid!\n"
+
+#: g10/keygen.c:650
+msgid "Do you really need such a large keysize? "
+msgstr "Kas te tõesti soovite nii pikka võtit? "
+
+#: g10/keygen.c:656
+#, c-format
+msgid "Requested keysize is %u bits\n"
+msgstr "Soovitud võtmepikkus on %u bitti\n"
+
+#: g10/keygen.c:659 g10/keygen.c:663
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "ümardatud üles %u bitini\n"
+
+#: g10/keygen.c:711
+msgid ""
+"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"
+msgstr ""
+"Palun määrake, kui kaua on võti kehtiv.\n"
+"         0 = võti ei aegu\n"
+"      <n>  = võti aegub n päevaga\n"
+"      <n>w = võti aegub n nädalaga\n"
+"      <n>m = võti aegub n kuuga\n"
+"      <n>y = võti aegub n aastaga\n"
+
+#: g10/keygen.c:726
+msgid "Key is valid for? (0) "
+msgstr "Võti on kehtiv kuni? (0) "
+
+#: g10/keygen.c:731
+msgid "invalid value\n"
+msgstr "vigane väärtus\n"
+
+#: g10/keygen.c:736
+msgid "Key does not expire at all\n"
+msgstr "Võti ei aegu kunagi\n"
+
+#. print the date when the key expires
+#: g10/keygen.c:742
+#, c-format
+msgid "Key expires at %s\n"
+msgstr "Võti aegub %s\n"
+
+#: g10/keygen.c:745
+msgid ""
+"Your system can't display dates beyond 2038.\n"
+"However, it will be correctly handled up to 2106.\n"
+msgstr ""
+"Teie süsteem ei saa esitada kuupäevi peale aastat 2038.\n"
+"Siiski käsitletakse neid korrektselt aastani 2106.\n"
+
+#: g10/keygen.c:750
+msgid "Is this correct (y/n)? "
+msgstr "On see õige (j/e)? "
+
+#: g10/keygen.c:793
+msgid ""
+"\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"
+msgstr ""
+"\n"
+"Võtme identifitseerimiseks on vaja määrata kasutaja; tarkvara konstrueerib\n"
+"kasutaja id kasutades pärisnime, kommentaari ja e-posti aadressi kujul:\n"
+"    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
+"\n"
+
+#: g10/keygen.c:805
+msgid "Real name: "
+msgstr "Pärisnimi: "
+
+#: g10/keygen.c:813
+msgid "Invalid character in name\n"
+msgstr "Lubamatu sümbol nimes\n"
+
+#: g10/keygen.c:815
+msgid "Name may not start with a digit\n"
+msgstr "Nimi ei või alata numbriga\n"
+
+#: g10/keygen.c:817
+msgid "Name must be at least 5 characters long\n"
+msgstr "Nimes peab olema vähemalt 5 sümbolit\n"
+
+#: g10/keygen.c:825
+msgid "Email address: "
+msgstr "E-posti aadress: "
+
+#: g10/keygen.c:836
+msgid "Not a valid email address\n"
+msgstr "See ei ole kehtiv e-posti aadress\n"
+
+#: g10/keygen.c:844
+msgid "Comment: "
+msgstr "Kommentaar: "
+
+#: g10/keygen.c:850
+msgid "Invalid character in comment\n"
+msgstr "Lubamatu sümbol kommentaaris\n"
+
+#: g10/keygen.c:873
+#, c-format
+msgid "You are using the `%s' character set.\n"
+msgstr "Te kasutate kooditabelit `%s'.\n"
+
+#: g10/keygen.c:879
+#, c-format
+msgid ""
+"You selected this USER-ID:\n"
+"    \"%s\"\n"
+"\n"
+msgstr ""
+"Te valisite selle KASUTAJA-ID:\n"
+"    \"%s\"\n"
+"\n"
+
+#: g10/keygen.c:883
+msgid "Please don't put the email address into the real name or the comment\n"
+msgstr "Ärge palun kirjutage e-posti aadressi pärisnimesse ega kommentaari\n"
+
+#: g10/keygen.c:888
+msgid "NnCcEeOoQq"
+msgstr "NnKkEeOoVv"
+
+#: g10/keygen.c:898
+msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
+msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (V)älju? "
+
+#: g10/keygen.c:899
+msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
+msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (O)k/(V)älju? "
+
+#: g10/keygen.c:918
+msgid "Please correct the error first\n"
+msgstr "Palun parandage kõigepealt viga\n"
+
+#: g10/keygen.c:956
+msgid ""
+"You need a Passphrase to protect your secret key.\n"
+"\n"
+msgstr ""
+"Te vajate oma salajase võtme kaitsmiseks parooli.\n"
+"\n"
+
+#: g10/keyedit.c:469 g10/keygen.c:964
+msgid "passphrase not correctly repeated; try again.\n"
+msgstr "parooli ei korratud õieti; proovige uuesti.\n"
+
+#: g10/keygen.c:970
+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"
+"using this program with the option \"--edit-key\".\n"
+"\n"
+msgstr ""
+"Te ei soovi parooli - see on tõenäoliselt *halb* idee!\n"
+"Ma siiski täidan teie soovi. Te saate oma parooli alati muuta,\n"
+"kasutades seda programmi võtmega \"--edit-key\".\n"
+"\n"
+
+#: g10/keygen.c:991
+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"
+"disks) during the prime generation; this gives the random number\n"
+"generator a better chance to gain enough entropy.\n"
+msgstr ""
+"Me peame genereerima palju juhuslikke baite. Praegu oleks hea teostada\n"
+"arvutil mingeid teisi tegevusi (kirjutada klaviatuuril, liigutada hiirt,\n"
+"kasutada kettaid jne), see annaks juhuarvude generaatorile võimaluse\n"
+"koguda paremat entroopiat.\n"
+
+#: g10/keygen.c:1440
+msgid "DSA keypair will have 1024 bits.\n"
+msgstr "DSA võtmepaari pikkuseks saab 1024 bitti.\n"
+
+#: g10/keygen.c:1483
+msgid "Key generation canceled.\n"
+msgstr "Võtme genereerimine katkestati.\n"
+
+#: g10/keygen.c:1581
+#, c-format
+msgid "writing public key to `%s'\n"
+msgstr "kirjutan avaliku võtme faili `%s'\n"
+
+#: g10/keygen.c:1582
+#, c-format
+msgid "writing secret key to `%s'\n"
+msgstr "kirjutan salajase võtme faili `%s'\n"
+
+#: g10/keygen.c:1679
+msgid "public and secret key created and signed.\n"
+msgstr "avalik ja salajane võti on loodud ja allkirjastatud.\n"
+
+#: g10/keygen.c:1684
+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 ""
+"Pidage silmas, et seda võtit ei saa kasutada krüptimiseks. \n"
+"Krüptimiseks tuleb genereerida teine võti, seda saate teha\n"
+"kasutades võtit \"--edit-key\".\n"
+
+#: g10/keygen.c:1701 g10/keygen.c:1807
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr "Võtme genereerimine ebaõnnestus: %s\n"
+
+#: g10/keygen.c:1748 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 "võti loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n"
+
+#: g10/keygen.c:1750 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 "võti loodi %lu sekundit tulevikus (ajahüpe või kella probleem)\n"
+
+#: g10/keygen.c:1783
+msgid "Really create? "
+msgstr "Loon tõesti? "
+
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
+#: g10/tdbio.c:515
+#, c-format
+msgid "%s: can't open: %s\n"
+msgstr "%s: ei saa avada: %s\n"
+
+#: g10/encode.c:113
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: g10/encode.c:171 g10/encode.c:327
+#, c-format
+msgid "%s: WARNING: empty file\n"
+msgstr "%s: HOIATUS: tühi fail\n"
+
+#: g10/encode.c:274
+#, c-format
+msgid "reading from `%s'\n"
+msgstr "loen failist `%s'\n"
+
+#: g10/encode.c:497
+#, c-format
+msgid "%s/%s encrypted for: %s\n"
+msgstr "%s/%s krüptitud kasutajale: %s\n"
+
+#: g10/export.c:153
+#, c-format
+msgid "%s: user not found: %s\n"
+msgstr "%s: kasutajat ei leitud: %s\n"
+
+#: g10/export.c:162
+#, c-format
+msgid "certificate read problem: %s\n"
+msgstr "probleem sertifikaadi lugemisel: %s\n"
+
+#: g10/export.c:171
+#, c-format
+msgid "key %08lX: not a rfc2440 key - skipped\n"
+msgstr "võti %08lX: ei ole rfc2440 võti - jätsin vahele\n"
+
+#: g10/export.c:182
+#, c-format
+msgid "key %08lX: not protected - skipped\n"
+msgstr "võti %08lX: ei ole kaitstud - jätsin vahele\n"
+
+#: g10/export.c:236
+msgid "WARNING: nothing exported\n"
+msgstr "HOIATUS: midagi ei eksporditud\n"
+
+#: g10/getkey.c:214
+msgid "too many entries in pk cache - disabled\n"
+msgstr "avalike võtmete puhvris on liiga palju võtmeid - blokeerin\n"
+
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+msgid "[User id not found]"
+msgstr "[Kasutaja id ei leitud]"
+
+#: g10/getkey.c:453
+msgid "too many entries in unk cache - disabled\n"
+msgstr "unk puhvris on liiga palju elemente - blokeerin\n"
+
+#: g10/getkey.c:2207
+#, c-format
+msgid "using secondary key %08lX instead of primary key %08lX\n"
+msgstr "kasutan sekundaarset võtit %08lX primaarse võtme %08lX asemel\n"
+
+#: g10/getkey.c:2249 g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "võti %08lX: salajane võti avaliku võtmeta - jätsin vahele\n"
+
+#: g10/import.c:184
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "jätan bloki tüübiga %d vahele\n"
+
+#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
+#, c-format
+msgid "%lu keys so far processed\n"
+msgstr "%lu võtit on seni töödeldud\n"
+
+#: g10/import.c:196
+#, c-format
+msgid "error reading `%s': %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: g10/import.c:206
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "Töödeldud kokku: %lu\n"
+
+#: g10/import.c:208
+#, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr " vahele jäetud uusi võtmeid: %lu\n"
+
+#: g10/import.c:211
+#, c-format
+msgid "          w/o user IDs: %lu\n"
+msgstr "    puudub kasutaja ID: %lu\n"
+
+#: g10/import.c:213
+#, c-format
+msgid "              imported: %lu"
+msgstr "            imporditud: %lu"
+
+#: g10/import.c:219
+#, c-format
+msgid "             unchanged: %lu\n"
+msgstr "              muutmata: %lu\n"
+
+#: g10/import.c:221
+#, c-format
+msgid "          new user IDs: %lu\n"
+msgstr "       uusi kasutajaid: %lu\n"
+
+#: g10/import.c:223
+#, c-format
+msgid "           new subkeys: %lu\n"
+msgstr "      uusi alamvõtmeid: %lu\n"
+
+#: g10/import.c:225
+#, c-format
+msgid "        new signatures: %lu\n"
+msgstr "         uusi allkirju: %lu\n"
+
+#: g10/import.c:227
+#, c-format
+msgid "   new key revocations: %lu\n"
+msgstr "      uusi tühistamisi: %lu\n"
+
+#: g10/import.c:229
+#, c-format
+msgid "      secret keys read: %lu\n"
+msgstr " loetud salajasi võtmeid: %lu\n"
+
+#: g10/import.c:231
+#, c-format
+msgid "  secret keys imported: %lu\n"
+msgstr " salajasi võtmeid imporditud: %lu\n"
+
+#: g10/import.c:233
+#, c-format
+msgid " secret keys unchanged: %lu\n"
+msgstr " muutmata salajasi võtmeid: %lu\n"
+
+#: g10/import.c:408 g10/import.c:617
+#, c-format
+msgid "key %08lX: no user ID\n"
+msgstr "võti %08lX: kasutaja ID puudub\n"
+
+#: g10/import.c:422
+#, c-format
+msgid "key %08lX: no valid user IDs\n"
+msgstr "võti %08lX: puudub kehtiv kasutaja ID\n"
+
+#: g10/import.c:424
+msgid "this may be caused by a missing self-signature\n"
+msgstr "see võib olla põhjustatud puuduvast iseenda allkirjast\n"
+
+#: g10/import.c:435 g10/import.c:684
+#, c-format
+msgid "key %08lX: public key not found: %s\n"
+msgstr "võti %08lX: avalikku võtit ei leitud: %s\n"
+
+#: g10/import.c:440
+#, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "võti %08lX: uus võti - jätsin vahele\n"
+
+#: g10/import.c:448
+msgid "no default public keyring\n"
+msgstr "puudub avalike võtmete vaikimisi võtmehoidla\n"
+
+#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
+#, c-format
+msgid "writing to `%s'\n"
+msgstr "kirjutan faili `%s'\n"
+
+#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
+#, c-format
+msgid "can't lock keyring `%s': %s\n"
+msgstr "võtmehoidlat `%s' ei saa lukustada: %s\n"
+
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
+#, c-format
+msgid "error writing keyring `%s': %s\n"
+msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
+
+#: g10/import.c:463
+#, c-format
+msgid "key %08lX: public key imported\n"
+msgstr "võti %08lX: avalik võti on imporditud\n"
+
+#: g10/import.c:480
+#, c-format
+msgid "key %08lX: doesn't match our copy\n"
+msgstr "võti %08lX: ei sobi meie koopiaga\n"
+
+#: g10/import.c:489 g10/import.c:692
+#, c-format
+msgid "key %08lX: can't locate original keyblock: %s\n"
+msgstr "võti %08lX: ei leia algset võtmeblokki: %s\n"
+
+#: g10/import.c:495 g10/import.c:698
+#, c-format
+msgid "key %08lX: can't read original keyblock: %s\n"
+msgstr "võti %08lX: ei saa lugeda algset võtmeblokki: %s\n"
+
+#: g10/import.c:522
+#, c-format
+msgid "key %08lX: 1 new user ID\n"
+msgstr "võti %08lX: 1 uus kasutaja ID\n"
+
+#: g10/import.c:525
+#, c-format
+msgid "key %08lX: %d new user IDs\n"
+msgstr "võti %08lX: %d uut kasutaja IDd\n"
+
+#: g10/import.c:528
+#, c-format
+msgid "key %08lX: 1 new signature\n"
+msgstr "võti %08lX: 1 uus allkiri\n"
+
+#: g10/import.c:531
+#, c-format
+msgid "key %08lX: %d new signatures\n"
+msgstr "võti %08lX: %d uut allkirja\n"
+
+#: g10/import.c:534
+#, c-format
+msgid "key %08lX: 1 new subkey\n"
+msgstr "võti %08lX: 1 uus alamvõti\n"
+
+#: g10/import.c:537
+#, c-format
+msgid "key %08lX: %d new subkeys\n"
+msgstr "võti %08lX: %d uut alamvõtit\n"
+
+#: g10/import.c:547
+#, c-format
+msgid "key %08lX: not changed\n"
+msgstr "võti %08lX: ei muudetud\n"
+
+#: g10/import.c:610
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:640
+#, c-format
+msgid "key %08lX: secret key imported\n"
+msgstr "võti %08lX: salajane võti on imporditud\n"
+
+#. we can't merge secret keys
+#: g10/import.c:644
+#, c-format
+msgid "key %08lX: already in secret keyring\n"
+msgstr "võti %08lX: on juba salajaste võtmete hoidlas\n"
+
+#: g10/import.c:649
+#, c-format
+msgid "key %08lX: secret key not found: %s\n"
+msgstr "võti %08lX: salajast võtit ei leitud: %s\n"
+
+#: g10/import.c:678
+#, c-format
+msgid "key %08lX: no public key - can't apply revocation certificate\n"
+msgstr ""
+"võti %08lX: avalik võti puudub - tühistamise sertifikaati ei saa rakendada\n"
+
+#: g10/import.c:709
+#, c-format
+msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
+msgstr "võti %08lX: vigane tühistamise sertifikaat: %s - lükkasin tagasi\n"
+
+#: g10/import.c:741
+#, c-format
+msgid "key %08lX: revocation certificate imported\n"
+msgstr "võti %08lX: tühistamise sertifikaat imporditud\n"
+
+#: g10/import.c:783
+#, c-format
+msgid "key %08lX: no user ID for signature\n"
+msgstr "võti %08lX: allkirjal puudub kasutaja ID\n"
+
+#: g10/import.c:790 g10/import.c:814
+#, c-format
+msgid "key %08lX: unsupported public key algorithm\n"
+msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm\n"
+
+#: g10/import.c:791
+#, c-format
+msgid "key %08lX: invalid self-signature\n"
+msgstr "võti %08lX: vigane iseenda allkiri\n"
+
+#: g10/import.c:806
+#, c-format
+msgid "key %08lX: no subkey for key binding\n"
+msgstr "võti %08lX: võtmeseosel puudub alamvõti\n"
+
+#: g10/import.c:815
+#, c-format
+msgid "key %08lX: invalid subkey binding\n"
+msgstr "võti %08lX: vigane alamvõtme seos\n"
+
+#: g10/import.c:842
+#, c-format
+msgid "key %08lX: accepted non self-signed user ID '"
+msgstr "võti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '"
+
+#: g10/import.c:871
+#, c-format
+msgid "key %08lX: skipped user ID '"
+msgstr "võti %08lX: jätsin vahele kasutaja ID '"
+
+#: g10/import.c:894
+#, c-format
+msgid "key %08lX: skipped subkey\n"
+msgstr "võti %08lX: jätsin alamvõtme vahele\n"
+
+#. here we violate the rfc a bit by still allowing
+#. * to import non-exportable signature when we have the
+#. * the secret key used to create this signature - it
+#. * seems that this makes sense
+#: g10/import.c:919
+#, c-format
+msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
+msgstr "võti %08lX: mitte eksporditav allkiri (klass %02x) - jätan vahele\n"
+
+#: g10/import.c:928
+#, c-format
+msgid "key %08lX: revocation certificate at wrong place - skipped\n"
+msgstr "võti %08lX: tühistamise sertifikaat on vales kohas - jätan vahele\n"
+
+#: g10/import.c:936
+#, c-format
+msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
+msgstr "võti %08lX: vigane tühistamise sertifikaat: %s - jätan vahele\n"
+
+#: g10/import.c:1036
+#, c-format
+msgid "key %08lX: duplicated user ID detected - merged\n"
+msgstr "võti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
+
+#: g10/import.c:1088
+#, c-format
+msgid "key %08lX: revocation certificate added\n"
+msgstr "võti %08lX: tühistamise sertifikaat lisatud\n"
+
+#: g10/import.c:1202 g10/import.c:1255
+#, c-format
+msgid "key %08lX: our copy has no self-signature\n"
+msgstr "võti %08lX: meie koopial puudub iseenda allkiri\n"
+
+#: g10/delkey.c:67 g10/keyedit.c:94
+#, c-format
+msgid "%s: user not found\n"
+msgstr "%s: kasutajat ei leitud\n"
+
+#: g10/keyedit.c:156
+msgid "[revocation]"
+msgstr "[tühistamine]"
+
+#: g10/keyedit.c:157
+msgid "[self-signature]"
+msgstr "[iseenda allkiri]"
+
+#: g10/keyedit.c:221
+msgid "1 bad signature\n"
+msgstr "1 halb allkiri\n"
+
+#: g10/keyedit.c:223
+#, c-format
+msgid "%d bad signatures\n"
+msgstr "%d halba allkirja\n"
+
+#: g10/keyedit.c:225
+msgid "1 signature not checked due to a missing key\n"
+msgstr "1 allkiri jäi testimata, kuna võti puudub\n"
+
+#: g10/keyedit.c:227
+#, c-format
+msgid "%d signatures not checked due to missing keys\n"
+msgstr "%d allkirja jäi testimata, kuna võtmed puuduvad\n"
+
+#: g10/keyedit.c:229
+msgid "1 signature not checked due to an error\n"
+msgstr "1 allkiri jäi vea tõttu kontrollimata\n"
+
+#: g10/keyedit.c:231
+#, c-format
+msgid "%d signatures not checked due to errors\n"
+msgstr "%d allkirja jäi vigade tõttu kontrollimata\n"
+
+#: g10/keyedit.c:233
+msgid "1 user ID without valid self-signature detected\n"
+msgstr "tuvastasin ühe kehtiva iseenda allkirjata kasutaja ID\n"
+
+#: g10/keyedit.c:235
+#, c-format
+msgid "%d user IDs without valid self-signatures detected\n"
+msgstr "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
+
+#. Fixme: see whether there is a revocation in which
+#. * case we should allow to sign it again.
+#: g10/keyedit.c:317
+#, c-format
+msgid "Already signed by key %08lX\n"
+msgstr "On juba allkirjastatud võtmega %08lX\n"
+
+#: g10/keyedit.c:325
+#, c-format
+msgid "Nothing to sign with key %08lX\n"
+msgstr "Võtmega %08lX pole midagi allkirjastada\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Are you really sure that you want to sign this key\n"
+"with your key: \""
+msgstr ""
+"Olete tõesti kindel, et soovite seda võtit oma\n"
+"võtmega allkirjastada: \""
+
+#: g10/keyedit.c:343
+msgid ""
+"The signature will be marked as non-exportable.\n"
+"\n"
+msgstr ""
+"Allkiri märgitakse mitte-eksporditavaks.\n"
+"\n"
+
+#: g10/keyedit.c:348
+msgid "Really sign? "
+msgstr "Allkirjastan tõesti? "
+
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "allkirjastamine ebaõnnestus: %s\n"
+
+#: g10/keyedit.c:428
+msgid "This key is not protected.\n"
+msgstr "See võti ei ole kaitstud.\n"
+
+#: g10/keyedit.c:432
+msgid "Secret parts of primary key are not available.\n"
+msgstr "Primaarse võtme salajased komponendid ei ole kättesaadavad.\n"
+
+#: g10/keyedit.c:436
+msgid "Key is protected.\n"
+msgstr "Võti on kaitstud.\n"
+
+#: g10/keyedit.c:456
+#, c-format
+msgid "Can't edit this key: %s\n"
+msgstr "Seda võtit ei saa toimetada: %s\n"
+
+#: g10/keyedit.c:461
+msgid ""
+"Enter the new passphrase for this secret key.\n"
+"\n"
+msgstr ""
+"Sisestage sellele salajasele võtmele uus parool.\n"
+"\n"
+
+#: g10/keyedit.c:473
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"\n"
+msgstr ""
+"Te ei soovi parooli - see on tõenäoliselt *halb* idee!\n"
+"\n"
+
+#: g10/keyedit.c:476
+msgid "Do you really want to do this? "
+msgstr "Kas te tõesti soovite seda teha? "
+
+#: g10/keyedit.c:540
+msgid "moving a key signature to the correct place\n"
+msgstr "tõstan võtme allkirja õigesse kohta\n"
+
+#: g10/keyedit.c:581
+msgid "quit this menu"
+msgstr "välju sellest menüüst"
+
+#: g10/keyedit.c:582
+msgid "q"
+msgstr "v"
+
+#: g10/keyedit.c:583
+msgid "save"
+msgstr "save"
+
+#: g10/keyedit.c:583
+msgid "save and quit"
+msgstr "salvesta ja välju"
+
+#: g10/keyedit.c:584
+msgid "help"
+msgstr "help"
+
+#: g10/keyedit.c:584
+msgid "show this help"
+msgstr "näita seda abiinfot"
+
+#: g10/keyedit.c:586
+msgid "fpr"
+msgstr "fpr"
+
+#: g10/keyedit.c:586
+msgid "show fingerprint"
+msgstr "näita sõrmejälge"
+
+#: g10/keyedit.c:587
+msgid "list"
+msgstr "list"
+
+#: g10/keyedit.c:587
+msgid "list key and user IDs"
+msgstr "näita võtit ja kasutaja IDd"
+
+#: g10/keyedit.c:588
+msgid "l"
+msgstr "l"
+
+#: g10/keyedit.c:589
+msgid "uid"
+msgstr "uid"
+
+#: g10/keyedit.c:589
+msgid "select user ID N"
+msgstr "vali kasutaja ID N"
+
+#: g10/keyedit.c:590
+msgid "key"
+msgstr "key"
+
+#: g10/keyedit.c:590
+msgid "select secondary key N"
+msgstr "vali sekundaarne võti N"
+
+#: g10/keyedit.c:591
+msgid "check"
+msgstr "check"
+
+#: g10/keyedit.c:591
+msgid "list signatures"
+msgstr "näita allkirju"
+
+#: g10/keyedit.c:592
+msgid "c"
+msgstr "c"
+
+#: g10/keyedit.c:593
+msgid "sign"
+msgstr "sign"
+
+#: g10/keyedit.c:593
+msgid "sign the key"
+msgstr "allkirjasta võti"
+
+#: g10/keyedit.c:594
+msgid "s"
+msgstr "s"
+
+#: g10/keyedit.c:595
+msgid "lsign"
+msgstr "lsign"
+
+#: g10/keyedit.c:595
+msgid "sign the key locally"
+msgstr "allkirjasta võti lokaalselt"
+
+#: g10/keyedit.c:596
+msgid "debug"
+msgstr "debug"
+
+#: g10/keyedit.c:597
+msgid "adduid"
+msgstr "adduid"
+
+#: g10/keyedit.c:597
+msgid "add a user ID"
+msgstr "lisa kasutaja ID"
+
+#: g10/keyedit.c:598
+msgid "deluid"
+msgstr "deluid"
+
+#: g10/keyedit.c:598
+msgid "delete user ID"
+msgstr "kustuta kasutaja ID"
+
+#: g10/keyedit.c:599
+msgid "addkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:599
+msgid "add a secondary key"
+msgstr "lisa sekundaarne võti"
+
+#: g10/keyedit.c:600
+msgid "delkey"
+msgstr "delkey"
+
+#: g10/keyedit.c:600
+msgid "delete a secondary key"
+msgstr "kustuta sekundaarne võti"
+
+#: g10/keyedit.c:601
+msgid "delsig"
+msgstr "delsig"
+
+#: g10/keyedit.c:601
+msgid "delete signatures"
+msgstr "kustuta allkirjad"
+
+#: g10/keyedit.c:602
+msgid "expire"
+msgstr "expire"
+
+#: g10/keyedit.c:602
+msgid "change the expire date"
+msgstr "muuda aegumise kuupäeva"
+
+#: g10/keyedit.c:603
+msgid "toggle"
+msgstr "toggle"
+
+#: g10/keyedit.c:603
+msgid "toggle between secret and public key listing"
+msgstr "lülita salajaste või avalike võtmete loendi vahel"
+
+#: g10/keyedit.c:605
+msgid "t"
+msgstr "t"
+
+#: g10/keyedit.c:606
+msgid "pref"
+msgstr "pref"
+
+#: g10/keyedit.c:606 g10/keyedit.c:607
+msgid "list preferences"
+msgstr "näita eelistusi"
+
+#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "pref"
+
+#: g10/keyedit.c:608
+msgid "passwd"
+msgstr "passwd"
+
+#: g10/keyedit.c:608
+msgid "change the passphrase"
+msgstr "muuda parooli"
+
+#: g10/keyedit.c:609
+msgid "trust"
+msgstr "trust"
+
+#: g10/keyedit.c:609
+msgid "change the ownertrust"
+msgstr "muuda omaniku usaldust"
+
+#: g10/keyedit.c:610
+msgid "revsig"
+msgstr "revsig"
+
+#: g10/keyedit.c:610
+msgid "revoke signatures"
+msgstr "tühista allkirjad"
+
+#: g10/keyedit.c:611
+msgid "revkey"
+msgstr "revkey"
+
+#: g10/keyedit.c:611
+msgid "revoke a secondary key"
+msgstr "tühista sekundaarne võti"
+
+#: g10/keyedit.c:612
+msgid "disable"
+msgstr "disable"
+
+#: g10/keyedit.c:612
+msgid "disable a key"
+msgstr "blokeeri võti"
+
+#: g10/keyedit.c:613
+msgid "enable"
+msgstr "enable"
+
+#: g10/keyedit.c:613
+msgid "enable a key"
+msgstr "luba võti"
+
+#: g10/delkey.c:110 g10/keyedit.c:633
+msgid "can't do that in batchmode\n"
+msgstr "seda ei saa teha pakettmoodis\n"
+
+#. check that they match
+#. fixme: check that they both match
+#: g10/keyedit.c:671
+msgid "Secret key is available.\n"
+msgstr "Salajane võti on kasutatav.\n"
+
+#: g10/keyedit.c:700
+msgid "Command> "
+msgstr "Käsklus> "
+
+#: g10/keyedit.c:730
+msgid "Need the secret key to do this.\n"
+msgstr "Selle tegamiseks on vaja salajast võtit.\n"
+
+#: g10/keyedit.c:734
+msgid "Please use the command \"toggle\" first.\n"
+msgstr "Palun kasutage kõigepealt käsku \"toggle\".\n"
+
+#: g10/keyedit.c:781
+msgid "Really sign all user IDs? "
+msgstr "Kas allkirjastan tõesti kõik kasutaja IDd? "
+
+#: g10/keyedit.c:782
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
+
+#: g10/keyedit.c:814 g10/keyedit.c:1000
+#, c-format
+msgid "update of trustdb failed: %s\n"
+msgstr "trustdb uuendamine ebaõnnestus: %s\n"
+
+#: g10/keyedit.c:825 g10/keyedit.c:846
+msgid "You must select at least one user ID.\n"
+msgstr "Te peate valima vähemalt ühe kasutaja ID.\n"
+
+#: g10/keyedit.c:827
+msgid "You can't delete the last user ID!\n"
+msgstr "Viimast kasutaja ID ei saa kustutada!\n"
+
+#: g10/keyedit.c:830
+msgid "Really remove all selected user IDs? "
+msgstr "Kas kustutan tõesti kõik kasutaja IDd? "
+
+#: g10/keyedit.c:831
+msgid "Really remove this user ID? "
+msgstr "Kas eemaldan tõesti selle kasutaja ID? "
+
+#: g10/keyedit.c:867 g10/keyedit.c:889
+msgid "You must select at least one key.\n"
+msgstr "Te peata valima vähemalt ühe võtme.\n"
+
+#: g10/keyedit.c:871
+msgid "Do you really want to delete the selected keys? "
+msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
+
+#: g10/keyedit.c:872
+msgid "Do you really want to delete this key? "
+msgstr "Kas te tõesti soovite seda võtit kustutada? "
+
+#: g10/keyedit.c:893
+msgid "Do you really want to revoke the selected keys? "
+msgstr "Kas te tõesti soovite valitud võtmeid tühistada? "
+
+#: g10/keyedit.c:894
+msgid "Do you really want to revoke this key? "
+msgstr "Kas te tõesti soovite seda võtit tühistada? "
+
+#: g10/keyedit.c:964
+msgid "Save changes? "
+msgstr "Salvestan muutused? "
+
+#: g10/keyedit.c:967
+msgid "Quit without saving? "
+msgstr "Väljun salvestamata? "
+
+#: g10/keyedit.c:978
+#, c-format
+msgid "update failed: %s\n"
+msgstr "uuendamine ebaõnnestus: %s\n"
+
+#: g10/keyedit.c:985
+#, c-format
+msgid "update secret failed: %s\n"
+msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
+
+#: g10/keyedit.c:992
+msgid "Key not changed so no update needed.\n"
+msgstr "Võtit ei muudetud, seega pole uuendamist vaja.\n"
+
+#: g10/keyedit.c:1007
+msgid "Invalid command  (try \"help\")\n"
+msgstr "Vigane käsklus (proovige \"help\")\n"
+
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
+#, c-format
+msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+msgstr "%s%c %4u%c/%08lX  loodud: %s aegub: %s"
+
+#: g10/keyedit.c:1140
+#, c-format
+msgid " trust: %c/%c"
+msgstr " usaldus: %c/%c"
+
+#: g10/keyedit.c:1144
+msgid "This key has been disabled"
+msgstr "See võti on blokeeritud"
+
+#: g10/keyedit.c:1173
+#, c-format
+msgid "rev! subkey has been revoked: %s\n"
+msgstr "rev! alamvõti on tühistatud: %s\n"
+
+#: g10/keyedit.c:1176
+msgid "rev- faked revocation found\n"
+msgstr "rev- leitud võltsitud tühistamine\n"
+
+#: g10/keyedit.c:1178
+#, c-format
+msgid "rev? problem checking revocation: %s\n"
+msgstr "rev? probleem tühistamise kontrollimisel: %s\n"
+
+#: g10/keyedit.c:1420
+msgid "Delete this good signature? (y/N/q)"
+msgstr "Kustutan selle hea allkirja? (j/E/v)"
+
+#: g10/keyedit.c:1424
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "Kustutan selle vigase allkirja? (j/E/v)"
+
+#: g10/keyedit.c:1428
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
+
+#: g10/keyedit.c:1434
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Kas tõesti kustutan selle iseenda allkirja? (j/E)"
+
+#: g10/keyedit.c:1448
+#, c-format
+msgid "Deleted %d signature.\n"
+msgstr "Kustutatud %d allkiri.\n"
+
+#: g10/keyedit.c:1449
+#, c-format
+msgid "Deleted %d signatures.\n"
+msgstr "Kustutatud %d allkirja.\n"
+
+#: g10/keyedit.c:1452
+msgid "Nothing deleted.\n"
+msgstr "Midagi ei kustutatud.\n"
+
+#: g10/keyedit.c:1521
+msgid "Please remove selections from the secret keys.\n"
+msgstr "Palun eemaldage salajastelt võtmetelt valikud.\n"
+
+#: g10/keyedit.c:1527
+msgid "Please select at most one secondary key.\n"
+msgstr "palun valige ülimalt üks sekundaarne võti.\n"
+
+#: g10/keyedit.c:1531
+msgid "Changing expiration time for a secondary key.\n"
+msgstr "Muudan sekundaarse võtme aegumise aega.\n"
+
+#: g10/keyedit.c:1533
+msgid "Changing expiration time for the primary key.\n"
+msgstr "Muudan primaarse võtme aegumise aega.\n"
+
+#: g10/keyedit.c:1575
+msgid "You can't change the expiration date of a v3 key\n"
+msgstr "v3 võtme aegumise aega ei saa muuta.\n"
+
+#: g10/keyedit.c:1591
+msgid "No corresponding signature in secret ring\n"
+msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
+
+#: g10/keyedit.c:1652
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "Kasutaja ID numbriga %d puudub\n"
+
+#: g10/keyedit.c:1698
+#, c-format
+msgid "No secondary key with index %d\n"
+msgstr "Sekundaarne võti numbriga %d puudub\n"
+
+#: g10/keyedit.c:1796
+msgid "user ID: \""
+msgstr "kasutaja ID: \""
+
+#: g10/keyedit.c:1799
+#, c-format
+msgid ""
+"\"\n"
+"signed with your key %08lX at %s\n"
+msgstr ""
+"\"\n"
+"allkirjastatud teie võtmega %08lX %s\n"
+
+#: g10/keyedit.c:1803
+msgid "Create a revocation certificate for this signature? (y/N)"
+msgstr "Loon sellele allkirjale tühistamise sertifikaadi? (j/E)"
+
+#. FIXME: detect duplicates here
+#: g10/keyedit.c:1827
+msgid "You have signed these user IDs:\n"
+msgstr "Te olete allkirjastanud järgnevad kasutaja IDd:\n"
+
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
+#, c-format
+msgid "   signed by %08lX at %s\n"
+msgstr "   allkirjastanud %08lX %s\n"
+
+#: g10/keyedit.c:1846
+#, c-format
+msgid "   revoked by %08lX at %s\n"
+msgstr "   tühistanud %08lX %s\n"
+
+#: g10/keyedit.c:1866
+msgid "You are about to revoke these signatures:\n"
+msgstr "Te asute tühistama järgmisi allkirju:\n"
+
+#: g10/keyedit.c:1884
+msgid "Really create the revocation certificates? (y/N)"
+msgstr "Kas tõesti loon tühistamise sertifikaadid? (j/E)"
+
+#: g10/keyedit.c:1913
+msgid "no secret key\n"
+msgstr "salajast võtit pole\n"
+
+#. of subkey
+#: g10/keylist.c:279 g10/mainproc.c:851
+#, c-format
+msgid " [expires: %s]"
+msgstr " [aegub: %s]"
+
+#: g10/mainproc.c:269
+#, c-format
+msgid "public key is %08lX\n"
+msgstr "avalik võti on %08lX\n"
+
+#: g10/mainproc.c:314
+msgid "public key encrypted data: good DEK\n"
+msgstr "avaliku võtmega krüptitud andmed: hea DEK\n"
+
+#: g10/mainproc.c:366
+#, c-format
+msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
+msgstr "krüptitud %u-bitise %s võtmega, ID %08lX, loodud %s\n"
+
+#: g10/mainproc.c:376
+#, c-format
+msgid "encrypted with %s key, ID %08lX\n"
+msgstr "krüptitud %s võtmega, ID %08lX\n"
+
+#: g10/mainproc.c:390
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "avaliku võtmega lahtikrüptimine ebaõnnestus: %s\n"
+
+#: g10/mainproc.c:430
+msgid "decryption okay\n"
+msgstr "lahtikrüptimine õnnestus\n"
+
+#: g10/mainproc.c:435
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "HOIATUS: krüptitud teadet on muudetud!\n"
+
+#: g10/mainproc.c:440
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr "lahtikrüptimine ebaõnnestus: %s\n"
+
+#: g10/mainproc.c:459
+msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
+msgstr "MÄRKUS: saatja nõudis \"ainult-teie-silmadele\"\n"
+
+#: g10/mainproc.c:461
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr "algne failinimi on='%.*s'\n"
+
+#: g10/mainproc.c:632
+msgid "standalone revocation - use \"gpg --import\" to apply\n"
+msgstr "eraldiseisev tühistus - realiseerimiseks kasutage \"gpg --import\"\n"
+
+#: g10/mainproc.c:719 g10/mainproc.c:728
+msgid "WARNING: invalid notation data found\n"
+msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
+
+#: g10/mainproc.c:731
+msgid "Notation: "
+msgstr "Noteering: "
+
+#: g10/mainproc.c:740
+msgid "Policy: "
+msgstr "Poliis: "
+
+#: g10/mainproc.c:1193
+msgid "signature verification suppressed\n"
+msgstr "allkirja kontroll jäeti ära\n"
+
+#. plaintext before signatures but no one-pass packets
+#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#, fuzzy
+msgid "can't handle these multiple signatures\n"
+msgstr "avateksti allkirjad üksteise sees\n"
+
+#: g10/mainproc.c:1256
+#, c-format
+msgid "Signature made %.*s using %s key ID %08lX\n"
+msgstr "Allkirja lõi %.*s kasutades %s võtit ID %08lX\n"
+
+#. just in case that we have no userid
+#: g10/mainproc.c:1284 g10/mainproc.c:1292
+msgid "BAD signature from \""
+msgstr "HALB allkiri kasutajalt \""
+
+#: g10/mainproc.c:1285 g10/mainproc.c:1293
+msgid "Good signature from \""
+msgstr "Hea allkiri kasutajalt \""
+
+#: g10/mainproc.c:1308
+msgid "                aka \""
+msgstr "                 ka \""
+
+#: g10/mainproc.c:1358
+#, c-format
+msgid "Can't check signature: %s\n"
+msgstr "Allkirja ei saa kontrollida: %s\n"
+
+#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "loo eraldiseisev allkiri"
+
+#: g10/mainproc.c:1454
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
+
+#: g10/mainproc.c:1511
+msgid "old style (PGP 2.x) signature\n"
+msgstr "vana stiili (PGP 2.x) allkiri\n"
+
+#: g10/mainproc.c:1518
+msgid "invalid root packet detected in proc_tree()\n"
+msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
+
+#: g10/misc.c:98
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "ei õnnestu blokeerida mälupildi salvestamist: %s\n"
+
+#: g10/misc.c:208
+msgid "Experimental algorithms should not be used!\n"
+msgstr "Eksperimentaalseid algoritme ei peaks kasutama!\n"
+
+#: g10/misc.c:238
+#, fuzzy
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+msgstr ""
+"see ¨iffri algoritm ei ole soovitatav; kasutage palun mõnd standardsemat!\n"
+
+#: g10/parse-packet.c:119
+#, c-format
+msgid "can't handle public key algorithm %d\n"
+msgstr "ei oska käsitleda avaliku võtme algoritmi %d\n"
+
+#: g10/parse-packet.c:1010
+#, c-format
+msgid "subpacket of type %d has critical bit set\n"
+msgstr "alampaketil tüübiga %d on kriitiline bitt seatud\n"
+
+#: g10/passphrase.c:223
+msgid "gpg-agent is not available in this session\n"
+msgstr ""
+
+#: g10/passphrase.c:229
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr ""
+
+#: g10/hkp.c:167 g10/passphrase.c:248
+#, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "ei õnnestu luua ühendust serveriga `%s': %s\n"
+
+#: g10/passphrase.c:313 g10/passphrase.c:576
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr " (peamise võtme ID %08lX)"
+
+#: g10/passphrase.c:323
+#, fuzzy, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"\n"
+"Te vajate kasutaja salajase võtme lahtilukustamiseks\n"
+"parooli: \""
+
+#: g10/passphrase.c:344
+#, fuzzy
+msgid "Enter passphrase\n"
+msgstr "Sisestage parool: "
+
+#: g10/passphrase.c:346
+#, fuzzy
+msgid "Repeat passphrase\n"
+msgstr "Korrake parooli: "
+
+#: g10/passphrase.c:384
+msgid "passphrase too long\n"
+msgstr ""
+
+#: g10/passphrase.c:396
+msgid "invalid response from agent\n"
+msgstr ""
+
+#: g10/passphrase.c:405
+msgid "cancelled by user\n"
+msgstr ""
+
+#: g10/passphrase.c:408 g10/passphrase.c:477
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr ""
+
+#: g10/passphrase.c:562
+msgid ""
+"\n"
+"You need a passphrase to unlock the secret key for\n"
+"user: \""
+msgstr ""
+"\n"
+"Te vajate kasutaja salajase võtme lahtilukustamiseks\n"
+"parooli: \""
+
+#: g10/passphrase.c:571
+#, c-format
+msgid "%u-bit %s key, ID %08lX, created %s"
+msgstr "%u-bitine %s võti, ID %08lX, loodud %s"
+
+#: g10/passphrase.c:609
+msgid "can't query password in batchmode\n"
+msgstr "pakettmoodis ei saa parooli küsida\n"
+
+#: g10/passphrase.c:613
+msgid "Enter passphrase: "
+msgstr "Sisestage parool: "
+
+#: g10/passphrase.c:617
+msgid "Repeat passphrase: "
+msgstr "Korrake parooli: "
+
+#: g10/plaintext.c:67
+msgid "data not saved; use option \"--output\" to save it\n"
+msgstr "andmeid ei salvestatud; salvestamiseks kasutage võtit \"--output\"\n"
+
+#: g10/plaintext.c:332
+msgid "Detached signature.\n"
+msgstr "Eraldiseisev allkiri.\n"
+
+#: g10/plaintext.c:336
+msgid "Please enter name of data file: "
+msgstr "Palun sisestage andmefaili nimi: "
+
+#: g10/plaintext.c:357
+msgid "reading stdin ...\n"
+msgstr "loen standardsisendit ...\n"
+
+#: g10/plaintext.c:391
+#, fuzzy
+msgid "no signed data\n"
+msgstr "allkirjastatud andmete avamine ebaõnnestus `%s'\n"
+
+#: g10/plaintext.c:399
+#, c-format
+msgid "can't open signed data `%s'\n"
+msgstr "allkirjastatud andmete avamine ebaõnnestus `%s'\n"
+
+#: g10/pubkey-enc.c:76
+#, c-format
+msgid "anonymous receiver; trying secret key %08lX ...\n"
+msgstr "anonüümne saaja; proovin salajast võtit %08lX ...\n"
+
+#: g10/pubkey-enc.c:82
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "ok, me oleme anonüümne teate saaja.\n"
+
+#: g10/pubkey-enc.c:134
+msgid "old encoding of the DEK is not supported\n"
+msgstr "vana DEK kodeerimine ei ole toetatud\n"
+
+#: g10/pubkey-enc.c:153
+#, c-format
+msgid "cipher algorithm %d is unknown or disabled\n"
+msgstr "¨iffri algoritm %d on tundmatu või blokeeritud\n"
+
+#: g10/pubkey-enc.c:192
+#, c-format
+msgid "NOTE: cipher algorithm %d not found in preferences\n"
+msgstr "MÄRKUS: ¨iffri algoritm %d puudub eelistustes\n"
+
+#: g10/pubkey-enc.c:198
+#, c-format
+msgid "NOTE: secret key %08lX expired at %s\n"
+msgstr "MÄRKUS: salajane võti %08lX aegus %s\n"
+
+#: g10/hkp.c:59
+#, c-format
+msgid "requesting key %08lX from %s ...\n"
+msgstr "küsin võtit %08lX serverist %s ...\n"
+
+#: g10/hkp.c:83
+#, c-format
+msgid "can't get key from keyserver: %s\n"
+msgstr "võtmeserverist ei saa võtit: %s\n"
+
+#: g10/hkp.c:102 g10/hkp.c:136
+msgid "no keyserver known (use option --keyserver)\n"
+msgstr "võtmeserver puudub (kasutage võtit --keyserver)\n"
+
+#: g10/hkp.c:110
+#, c-format
+msgid "%s: not a valid key ID\n"
+msgstr "%s: ei ole kehtiv võtme ID\n"
+
+#: g10/hkp.c:191
+#, c-format
+msgid "error sending to `%s': %s\n"
+msgstr "viga teate saatmisel serverile `%s': %s\n"
+
+#: g10/hkp.c:203
+#, c-format
+msgid "success sending to `%s' (status=%u)\n"
+msgstr "teate saatmine serverile `%s' õnnestus (olek=%u)\n"
+
+#: g10/hkp.c:206
+#, c-format
+msgid "failed sending to `%s': status=%u\n"
+msgstr "teate saatmine serverile `%s' ebaõnnestus: olek=%u\n"
+
+#: g10/seckey-cert.c:53
+msgid "secret key parts are not available\n"
+msgstr "salajase võtme komponendid ei ole kättesaadavad\n"
+
+#: g10/seckey-cert.c:59
+#, c-format
+msgid "protection algorithm %d is not supported\n"
+msgstr "algoritm %d ei ole toetatud\n"
+
+#: g10/seckey-cert.c:184
+msgid "Invalid passphrase; please try again ...\n"
+msgstr "Vigane parool; palun proovige uuesti ...\n"
+
+#: g10/seckey-cert.c:240
+msgid "WARNING: Weak key detected - please change passphrase again.\n"
+msgstr "HOIATUS: Tuvastasin nõrga võtme - palun muutke uuesti parooli.\n"
+
+#: g10/sig-check.c:199
+msgid "assuming bad MDC due to an unknown critical bit\n"
+msgstr "oletan tundmatu kriitilise biti tõttu vigast MDC\n"
+
+#: g10/sig-check.c:297
+msgid ""
+"this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
+msgstr ""
+"see on PGP genereeritud ElGamal võti ja EI OLE allkirjastamiseks turvaline!\n"
+
+#: g10/sig-check.c:305
+#, c-format
+msgid "public key is %lu second newer than the signature\n"
+msgstr "avalik võti on %lu sekund uuem, kui allkiri\n"
+
+#: g10/sig-check.c:306
+#, c-format
+msgid "public key is %lu seconds newer than the signature\n"
+msgstr "avalik võti on %lu sekundit uuem, kui allkiri\n"
+
+#: g10/sig-check.c:328
+#, fuzzy, c-format
+msgid "NOTE: signature key %08lX expired %s\n"
+msgstr "MÄRKUS: allkirja võti aegus %s\n"
+
+#: g10/sig-check.c:398
+msgid "assuming bad signature due to an unknown critical bit\n"
+msgstr "eeldan tundmatu kriitilise biti tõttu vigast allkirja\n"
+
+#: g10/sign.c:152
+#, fuzzy, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "Allkirja ei saa kontrollida: %s\n"
+
+#: g10/sign.c:161
+#, c-format
+msgid "%s signature from: %s\n"
+msgstr "%s allkiri kasutajalt: %s\n"
+
+#: g10/sign.c:307 g10/sign.c:630
+#, c-format
+msgid "can't create %s: %s\n"
+msgstr "%s ei saa luua: %s\n"
+
+#: g10/sign.c:405
+msgid "signing:"
+msgstr "allkirjastan:"
+
+#: g10/sign.c:448
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "HOIATUS: `%s' on tühi fail\n"
+
+#: g10/textfilter.c:134
+#, c-format
+msgid "can't handle text lines longer than %d characters\n"
+msgstr "ei suuda käsitleda tekstiridu mis on pikemad, kui %d sümbolit\n"
+
+#: g10/textfilter.c:231
+#, c-format
+msgid "input line longer than %d characters\n"
+msgstr "sisendrida on pikem, kui %d sümbolit\n"
+
+#: g10/tdbio.c:116 g10/tdbio.c:1623
+#, c-format
+msgid "trustdb rec %lu: lseek failed: %s\n"
+msgstr "trustdb kirje %lu: lseek ebaõnnestus: %s\n"
+
+#: g10/tdbio.c:122 g10/tdbio.c:1630
+#, c-format
+msgid "trustdb rec %lu: write failed (n=%d): %s\n"
+msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
+
+#: g10/tdbio.c:232
+msgid "trustdb transaction too large\n"
+msgstr "trustdb transaktsioon on liiga suur\n"
+
+#: g10/tdbio.c:424
+#, c-format
+msgid "%s: can't access: %s\n"
+msgstr "%s: ei saa kasutada: %s\n"
+
+#: g10/tdbio.c:438
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: kataloogi ei ole!\n"
+
+#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s: ei saa luua: %s\n"
+
+#: g10/tdbio.c:459 g10/tdbio.c:508
+#, c-format
+msgid "%s: can't create lock\n"
+msgstr "%s: lukku ei õnnestu luua\n"
+
+#: g10/tdbio.c:473
+#, c-format
+msgid "%s: failed to create version record: %s"
+msgstr "%s: versioonikirje loomine ei õnnestu: %s"
+
+#: g10/tdbio.c:477
+#, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr "%s: loodi vigane usalduse andmebaas\n"
+
+#: g10/tdbio.c:480
+#, c-format
+msgid "%s: trustdb created\n"
+msgstr "%s: trustdb on loodud\n"
+
+#: g10/tdbio.c:517
+#, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "%s: vigane trustdb\n"
+
+#: g10/tdbio.c:550
+#, c-format
+msgid "%s: failed to create hashtable: %s\n"
+msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
+
+#: g10/tdbio.c:558
+#, c-format
+msgid "%s: error updating version record: %s\n"
+msgstr "%s: viga versioonikirje uuendamisel: %s\n"
+
+#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
+#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
+#, c-format
+msgid "%s: error reading version record: %s\n"
+msgstr "%s: viga versioonikirje lugemisel: %s\n"
+
+#: g10/tdbio.c:587 g10/tdbio.c:646
+#, c-format
+msgid "%s: error writing version record: %s\n"
+msgstr "%s: viga versioonikirje kirjutamisel: %s\n"
+
+#: g10/tdbio.c:1235
+#, c-format
+msgid "trustdb: lseek failed: %s\n"
+msgstr "trustdb: lseek ebaõnnestus: %s\n"
+
+#: g10/tdbio.c:1243
+#, c-format
+msgid "trustdb: read failed (n=%d): %s\n"
+msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n"
+
+#: g10/tdbio.c:1264
+#, c-format
+msgid "%s: not a trustdb file\n"
+msgstr "%s: ei ole trustdb fail\n"
+
+#: g10/tdbio.c:1280
+#, c-format
+msgid "%s: version record with recnum %lu\n"
+msgstr "%s: versioonikirje kirje numbriga %lu\n"
+
+#: g10/tdbio.c:1285
+#, c-format
+msgid "%s: invalid file version %d\n"
+msgstr "%s: vigane faili versioon %d\n"
+
+#: g10/tdbio.c:1589
+#, c-format
+msgid "%s: error reading free record: %s\n"
+msgstr "%s: viga vaba kirje lugemisel: %s\n"
+
+#: g10/tdbio.c:1597
+#, c-format
+msgid "%s: error writing dir record: %s\n"
+msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
+
+#: g10/tdbio.c:1607
+#, c-format
+msgid "%s: failed to zero a record: %s\n"
+msgstr "%s: kirje nullimine ebaõnnestus: %s\n"
+
+#: g10/tdbio.c:1637
+#, c-format
+msgid "%s: failed to append a record: %s\n"
+msgstr "%s: kirje lisamine ebaõnnestus: %s\n"
+
+#: g10/tdbio.c:1748
+msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+msgstr "trustdb on vigane; palun käivitage \"gpg --fix-trustdb\".\n"
+
+#: g10/trustdb.c:169
+#, c-format
+msgid "trust record %lu, req type %d: read failed: %s\n"
+msgstr "usalduse kirje %lu, päringu tüüp %d: lugemine ebaõnnestus: %s\n"
+
+#: g10/trustdb.c:184
+#, c-format
+msgid "trust record %lu, type %d: write failed: %s\n"
+msgstr "usalduse kirje %lu, tüüp %d: kirjutamine ebaõnnestus: %s\n"
+
+#: g10/trustdb.c:198
+#, c-format
+msgid "trust record %lu: delete failed: %s\n"
+msgstr "usalduse kirje %lu: kustutamine ebaõnnestus: %s\n"
+
+#: g10/trustdb.c:212
+#, c-format
+msgid "trustdb: sync failed: %s\n"
+msgstr "trustdb: sync ebaõnnestus: %s\n"
+
+#: g10/trustdb.c:377
+#, c-format
+msgid "error reading dir record for LID %lu: %s\n"
+msgstr "viga LID %lu kataloogikirje lugemisel: %s\n"
+
+#: g10/trustdb.c:384
+#, c-format
+msgid "lid %lu: expected dir record, got type %d\n"
+msgstr "lid %lu: ootasin kataloogikirjet, sain tüübi %d\n"
+
+#: g10/trustdb.c:389
+#, c-format
+msgid "no primary key for LID %lu\n"
+msgstr "LID %lu primaarne võti puudub\n"
+
+#: g10/trustdb.c:394
+#, c-format
+msgid "error reading primary key for LID %lu: %s\n"
+msgstr "viga LID %lu primaarse võtme lugemisel: %s\n"
+
+#: g10/trustdb.c:433
+#, c-format
+msgid "get_dir_record: search_record failed: %s\n"
+msgstr "get_dir_record: search_record ebaõnnestus: %s\n"
+
+#: g10/trustdb.c:474
+#, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "'%s' ei ole kehtiv pikk võtmeID\n"
+
+#: g10/trustdb.c:501
+#, c-format
+msgid "key %08lX: can't put it into the trustdb\n"
+msgstr "võti %08lX: trustdb faili lisamine ei õnnestu\n"
+
+#: g10/trustdb.c:507
+#, c-format
+msgid "key %08lX: query record failed\n"
+msgstr "võti %08lX: kirje otsing ebaõnnestus\n"
+
+#: g10/trustdb.c:516
+#, c-format
+msgid "key %08lX: already in trusted key table\n"
+msgstr "võti %08lX: on juba usaldatavate võtmete tabelis\n"
+
+#: g10/trustdb.c:519
+#, c-format
+msgid "key %08lX: accepted as trusted key.\n"
+msgstr "võti %08lX: aktsepteerin usaldusväärse võtmena.\n"
+
+#: g10/trustdb.c:546
+#, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "võti %08lX: usaldataval võtmel pole avalikku võtit - jätsin vahele\n"
+
+#: g10/trustdb.c:565
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "MÄRKUS: salajane võti %08lX EI OLE kaitstud.\n"
+
+#: g10/trustdb.c:584
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr "võti %08lX: salajane ja avalik võti ei sobi\n"
+
+#: g10/trustdb.c:597
+#, c-format
+msgid "enumerate secret keys failed: %s\n"
+msgstr "salajaste võtmete loendamine ebaõnnestus: %s\n"
+
+#: g10/trustdb.c:987
+#, c-format
+msgid "key %08lX.%lu: Good subkey binding\n"
+msgstr "võti %08lX.%lu: Hea alamvõtme seos\n"
+
+#: g10/trustdb.c:993 g10/trustdb.c:1028
+#, c-format
+msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
+msgstr "võti %08lX.%lu: Vigane alamvõtme seos: %s\n"
+
+#: g10/trustdb.c:1005
+#, c-format
+msgid "key %08lX.%lu: Valid key revocation\n"
+msgstr "võti %08lX.%lu: kehtiv võtme tühistamine\n"
+
+#: g10/trustdb.c:1011
+#, c-format
+msgid "key %08lX.%lu: Invalid key revocation: %s\n"
+msgstr "võti %08lX.%lu: Vigane võtme tühistamine: %s\n"
+
+#: g10/trustdb.c:1022
+#, c-format
+msgid "key %08lX.%lu: Valid subkey revocation\n"
+msgstr "võti %08lX.%lu: Kehtiv alamvõtme tühistamine\n"
+
+#: g10/trustdb.c:1133
+msgid "Good self-signature"
+msgstr "Hea iseenda allkiri"
+
+#: g10/trustdb.c:1143
+msgid "Invalid self-signature"
+msgstr "Vigane iseenda allkiri"
+
+#: g10/trustdb.c:1170
+msgid "Valid user ID revocation skipped due to a newer self signature"
+msgstr ""
+"Jätsin kehtiva kasutaja ID tühistuse vahele, kuna leidub uuem iseenda allkiri"
+
+#: g10/trustdb.c:1176
+msgid "Valid user ID revocation"
+msgstr "Kehtiv kasutaja ID tühistamine"
+
+#: g10/trustdb.c:1181
+msgid "Invalid user ID revocation"
+msgstr "Vigane kasutaja ID tühistamine"
+
+#: g10/trustdb.c:1223
+msgid "Valid certificate revocation"
+msgstr "Kehtiv sertifikaadi tühistus"
+
+#: g10/trustdb.c:1224
+msgid "Good certificate"
+msgstr "Hea sertifikaat"
+
+#: g10/trustdb.c:1252
+msgid "Invalid certificate revocation"
+msgstr "Vigane sertifikaadi tühistus"
+
+#: g10/trustdb.c:1253
+msgid "Invalid certificate"
+msgstr "Vigane sertifikaat"
+
+#: g10/trustdb.c:1270 g10/trustdb.c:1274
+#, c-format
+msgid "sig record %lu[%d] points to wrong record.\n"
+msgstr "allkirjakirje %lu[%d] viitab valele kirjele.\n"
+
+#: g10/trustdb.c:1333
+msgid "duplicated certificate - deleted"
+msgstr "duplikaat sertifikaat - kustutasin"
+
+#: g10/trustdb.c:1650
+#, c-format
+msgid "tdbio_search_dir failed: %s\n"
+msgstr "tdbio_search_dir ebaõnnestus: %s\n"
+
+#: g10/trustdb.c:1784
+#, c-format
+msgid "lid ?: insert failed: %s\n"
+msgstr "lid ?: lisamine ebaõnnestus: %s\n"
+
+#: g10/trustdb.c:1789
+#, c-format
+msgid "lid %lu: insert failed: %s\n"
+msgstr "lid %lu: lisamine ebaõnnestus: %s\n"
+
+#: g10/trustdb.c:1795
+#, c-format
+msgid "lid %lu: inserted\n"
+msgstr "lid %lu: lisatud\n"
+
+#: g10/trustdb.c:1800
+#, c-format
+msgid "error reading dir record: %s\n"
+msgstr "viga kataloogikirje lugemisel: %s\n"
+
+#: g10/trustdb.c:1808 g10/trustdb.c:1871
+#, c-format
+msgid "%lu keys processed\n"
+msgstr "%lu võtit on töödeldud\n"
+
+#: g10/trustdb.c:1810 g10/trustdb.c:1877
+#, c-format
+msgid "\t%lu keys with errors\n"
+msgstr "\t%lu vigadega võtit\n"
+
+#: g10/trustdb.c:1812
+#, c-format
+msgid "\t%lu keys inserted\n"
+msgstr "\t%lu võtit lisatud\n"
+
+#: g10/trustdb.c:1815
+#, c-format
+msgid "enumerate keyblocks failed: %s\n"
+msgstr "võtmeblokkide loendamine ebaõnnestus: %s\n"
+
+#: g10/trustdb.c:1863
+#, c-format
+msgid "lid %lu: dir record w/o key - skipped\n"
+msgstr "lid %lu: kataloogikirje ilma võtmeta - jätsin vahele\n"
+
+#: g10/trustdb.c:1873
+#, c-format
+msgid "\t%lu due to new pubkeys\n"
+msgstr "\t%lu uut avalikku võtit\n"
+
+#: g10/trustdb.c:1875
+#, c-format
+msgid "\t%lu keys skipped\n"
+msgstr "\t%lu võtit jäetud vahele\n"
+
+#: g10/trustdb.c:1879
+#, c-format
+msgid "\t%lu keys updated\n"
+msgstr "\t%lu võtit uuendatud\n"
+
+#: g10/trustdb.c:2224
+msgid "Ooops, no keys\n"
+msgstr "Ooops, võtmeid pole\n"
+
+#: g10/trustdb.c:2228
+msgid "Ooops, no user IDs\n"
+msgstr "Ooops, puudub kasutaja ID\n"
+
+#: g10/trustdb.c:2386
+#, c-format
+msgid "check_trust: search dir record failed: %s\n"
+msgstr "check_trust: kataloogikirje otsimine ebaõnnestus: %s\n"
+
+#: g10/trustdb.c:2395
+#, c-format
+msgid "key %08lX: insert trust record failed: %s\n"
+msgstr "võti %08lX: usalduse kirje lisamine ebaõnnestus: %s\n"
+
+#: g10/trustdb.c:2399
+#, c-format
+msgid "key %08lX.%lu: inserted into trustdb\n"
+msgstr "võti %08lX.%lu: lisatud trustdb faili\n"
+
+#: g10/trustdb.c:2407
+#, c-format
+msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
+msgstr "võti %08lX.%lu: loodud tulevikus (aja hüpe või kella probleem)\n"
+
+#: g10/trustdb.c:2422
+#, c-format
+msgid "key %08lX.%lu: expired at %s\n"
+msgstr "võti %08lX.%lu: aegus %s\n"
+
+#: g10/trustdb.c:2430
+#, c-format
+msgid "key %08lX.%lu: trust check failed: %s\n"
+msgstr "võti %08lX.%lu: usalduse kontroll ebaõnnestus: %s\n"
+
+#: g10/trustdb.c:2581
+#, c-format
+msgid "user '%s' not found: %s\n"
+msgstr "kasutajat '%s' ei leitud: %s\n"
+
+#: g10/trustdb.c:2583
+#, c-format
+msgid "problem finding '%s' in trustdb: %s\n"
+msgstr "probleem '%s' trustdbst leidmisel: %s\n"
+
+#: g10/trustdb.c:2586
+#, c-format
+msgid "user '%s' not in trustdb - inserting\n"
+msgstr "kasutaja '%s' puudub trustdb failis - lisan\n"
+
+#: g10/trustdb.c:2589
+#, c-format
+msgid "failed to put '%s' into trustdb: %s\n"
+msgstr "'%s' trustdb faili lisamine ebaõnnestus: %s\n"
+
+#: g10/trustdb.c:2775 g10/trustdb.c:2805
+msgid "WARNING: can't yet handle long pref records\n"
+msgstr "HOIATUS: ei käsitle veel pikki eelistuste kirjeid\n"
+
+#: g10/verify.c:108
+msgid ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+msgstr ""
+"allkirja ei õnnestu kontrollida.\n"
+"Palun pidage meeles, et allkirja fail (.sig või .asc)\n"
+"peab olema käsureal esimene fail.\n"
+
+#: g10/verify.c:173
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr "sisendrida %u on liiga pikk või seavahetus puudub\n"
+
+#: g10/ringedit.c:302
+#, c-format
+msgid "%s: can't create keyring: %s\n"
+msgstr "%s: võtmehoidlat ei õnnestu luua: %s\n"
+
+#: g10/ringedit.c:319 g10/ringedit.c:1376
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: võtmehoidla on loodud\n"
+
+#: g10/ringedit.c:1557
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "HOIATUS: on olemas 2 faili konfidentsiaalse infoga.\n"
+
+#: g10/ringedit.c:1558
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s ei ole muudetud\n"
+
+#: g10/ringedit.c:1559
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s on uus\n"
+
+#: g10/ringedit.c:1560
+msgid "Please fix this possible security flaw\n"
+msgstr "Palun parandage see võimalik turvaprobleem\n"
+
+#: g10/skclist.c:110 g10/skclist.c:166
+msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+msgstr ""
+"võti ei ole märgitud ebaturvaliseks - sellega ei saa võlts RNGd kasutada!\n"
+
+#: g10/skclist.c:138
+#, fuzzy, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "`%s' jäi vahele: %s\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
+#, c-format
+msgid "skipped `%s': %s\n"
+msgstr "`%s' jäi vahele: %s\n"
+
+#: g10/skclist.c:149
+#, fuzzy
+msgid "skipped: secret key already present\n"
+msgstr "%s: jätsin vahele: avalik võti on juba olemas\n"
+
+#: g10/skclist.c:160
+#, c-format
+msgid ""
+"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"signatures!\n"
+msgstr ""
+"jätsin `%s' vahele: see on PGP genereeritud ElGamal võti,\n"
+"mis ei ole allkirjades kasutamiseks turvaline!\n"
+
+#. do not overwrite
+#: g10/openfile.c:84
+#, c-format
+msgid "File `%s' exists. "
+msgstr "Fail `%s' on olemas. "
+
+#: g10/openfile.c:86
+msgid "Overwrite (y/N)? "
+msgstr "Kirjutan üle (j/E)? "
+
+#: g10/openfile.c:119
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr "%s: tundmatu suffiks\n"
+
+#: g10/openfile.c:141
+msgid "Enter new filename"
+msgstr "Sisestage uus failinimi"
+
+#: g10/openfile.c:184
+msgid "writing to stdout\n"
+msgstr "kirjutan standardväljundisse\n"
+
+#: g10/openfile.c:273
+#, c-format
+msgid "assuming signed data in `%s'\n"
+msgstr "eeldan allkirjastatud andmeid failis `%s'\n"
+
+#: g10/openfile.c:323
+#, c-format
+msgid "%s: new options file created\n"
+msgstr "%s: uus omaduste fail on loodud\n"
+
+#: g10/openfile.c:350
+#, c-format
+msgid "%s: can't create directory: %s\n"
+msgstr "%s: kataloogi ei saa luua: %s\n"
+
+#: g10/openfile.c:353
+#, c-format
+msgid "%s: directory created\n"
+msgstr "%s: kataloog on loodud\n"
+
+#: g10/openfile.c:355
+msgid "you have to start GnuPG again, so it can read the new options file\n"
+msgstr "te peate GnuPG uuesti käivitama, siis võetakse uued võtmed arvesse\n"
+
+#: g10/encr-data.c:66
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s krüptitud andmed\n"
+
+#: g10/encr-data.c:68
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "krüptitud tundmatu algoritmiga %d\n"
+
+#: g10/encr-data.c:90
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgstr "HOIATUS: teade on krüptitud sümmeetrilise ¨iffri nõrga võtmega.\n"
+
+#: g10/encr-data.c:97
+#, fuzzy
+msgid "problem handling encrypted packet\n"
+msgstr "ära lisa krüptimisel võtme id"
+
+#: g10/seskey.c:52
+msgid "weak key created - retrying\n"
+msgstr "loodi nõrk võti - proovin uuesti\n"
+
+#: g10/seskey.c:57
+#, c-format
+msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
+msgstr ""
+"sümmeetrilises ¨iffris ei õnnestu vältida nõrka võtit; proovisin %d korda!\n"
+
+#: g10/delkey.c:114
+msgid "can't do that in batchmode without \"--yes\"\n"
+msgstr "pakettmoodis ei saa seda teha ilma võtmeta \"--yes\"\n"
+
+#: g10/delkey.c:136
+msgid "Delete this key from the keyring? "
+msgstr "Kustutan selle võtme võtmehoidlast? "
+
+#: g10/delkey.c:144
+msgid "This is a secret key! - really delete? "
+msgstr "See on salajane võti! - kas kustutan tõesti? "
+
+#: g10/delkey.c:181
+msgid "there is a secret key for this public key!\n"
+msgstr "selle avaliku võtme jaoks on salajane võti!\n"
+
+#: g10/delkey.c:183
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr "selle kustutamiseks kasutage võtit \"--delete-secret-key\".\n"
+
+#: g10/helptext.c:47
+msgid ""
+"It's up to you to assign a value here; this value will never be exported\n"
+"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
+"to do with the (implicitly created) web-of-certificates."
+msgstr ""
+"Teie ülesanne on sisestada nüüd väärtus; seda väärtust ei avalikustata\n"
+"kolmandatele pooltele. Seda väärtust on vaja et realiseerida usaldusvõrk."
+
+#: g10/helptext.c:53
+msgid "If you want to use this revoked key anyway, answer \"yes\"."
+msgstr "Kui te ikkagi soovite kasutada seda kehtetut võtit, vastake \"jah\"."
+
+#: g10/helptext.c:57
+msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+msgstr ""
+"Kui te ikkagi soovite kasutada seda mitteusaldatavat võtit, vastake \"jah\"."
+
+#: g10/helptext.c:61
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
+msgstr "Sisestage kasutaja ID aadressile, kellele te soovite teadet saata."
+
+#: g10/helptext.c:65
+msgid ""
+"Select the algorithm to use.\n"
+"\n"
+"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+"for signatures.  This is the suggested algorithm because verification of\n"
+"DSA signatures are much faster than those of ElGamal.\n"
+"\n"
+"ElGamal is an algorithm which can be used for signatures and encryption.\n"
+"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+"only\n"
+"and a sign+encrypt; actually it is the same, but some parameters must be\n"
+"selected in a special way to create a safe key for signatures: this program\n"
+"does this but other OpenPGP implementations are not required to understand\n"
+"the signature+encryption flavor.\n"
+"\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."
+msgstr ""
+"Valige algoritmi, mida kasutada.\n"
+"\n"
+"DSA (ka DSS) on digitaalallkirja algoritm, mida saab kasutada ainult\n"
+"allkirjades. See on soovitatav algoritm, kuna DSA allkirjade kontroll\n"
+"on oluliselt kiirem ElGamal allkirjade kontrollimisest.\n"
+"\n"
+"ElGamal on algoritm, mida saab kasutada nii allkirjastamisel, kui ka\n"
+"krüptimisel. OpenPGP eristab selle algoritmi kahte varianti: ainult\n"
+"krüptivat ja krüptivat ning allkirjastavat. Algoritm on sama, aga\n"
+"turvaliseks allkirjastamiseks on vaja valida sobivad parameetrid. See\n"
+"programm toetab mõlemat varianti, aga teised OpenPGP realisatsioonid\n"
+"ei pruugi krüptivat ning allkirjastavat võimalust tunda.\n"
+"\n"
+"Esimene (primaarne) võti peab alati olema selline, mida saab kasutada\n"
+"allkirjastamisel; see on ka põhjus, miks selles menüüs ei lubata valida\n"
+"ainult krüptivat ElGamal võtit."
+
+#: g10/helptext.c:85
+msgid ""
+"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."
+msgstr ""
+"Kuigi need võtmed on kirjeldatud dokumendis RFC2440, ei ole nende\n"
+"kasutamine soovitatav, kuna mitte kõik programmid ei toeta neid\n"
+"ja nendega loodud allkirjad on suured ning kontrollimine aeglane."
+
+#: g10/helptext.c:92
+msgid "Enter the size of the key"
+msgstr "Sisestage võtmepikkus"
+
+#: g10/helptext.c:96 g10/helptext.c:101 g10/helptext.c:113 g10/helptext.c:145
+#: g10/helptext.c:150 g10/helptext.c:155 g10/helptext.c:160
+msgid "Answer \"yes\" or \"no\""
+msgstr "Vastake \"jah\" või \"ei\""
+
+#: g10/helptext.c:106
+msgid ""
+"Enter the required value as shown in the prompt.\n"
+"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+"get a good error response - instead the system tries to interpret\n"
+"the given value as an interval."
+msgstr ""
+"Sisestage nõutav väärtus, nagu viibal näidati.\n"
+"Võimalik on ka sisestada ISO kuupäev (AAAA-KK-PP), aga te ei\n"
+"saa korrektset veateadet, kuna süsteem üritab antud väärtust\n"
+"tõlgendada vahemikuna."
+
+#: g10/helptext.c:118
+msgid "Enter the name of the key holder"
+msgstr "Sisestage võtmehoidja nimi"
+
+#: g10/helptext.c:123
+msgid "please enter an optional but highly suggested email address"
+msgstr "palun e-posti aadress, aadress ei ole kohustuslik, aga väga soovitav"
+
+#: g10/helptext.c:127
+msgid "Please enter an optional comment"
+msgstr "Te sõite nüüd sisestada kommentaari"
+
+#: g10/helptext.c:132
+msgid ""
+"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."
+msgstr ""
+"N  et muuta nime.\n"
+"K  et muuta kommentaari.\n"
+"E  et muuta e-posti aadressi.\n"
+"O  et jätkata võtme loomist.\n"
+"V  et lõpetada võtme loomine."
+
+#: g10/helptext.c:141
+msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+msgstr "Vastake \"jah\" (või \"j\"), kui võib alustada alamvõtme loomisega."
+
+#: g10/helptext.c:164
+msgid "Answer \"yes\" is you want to sign ALL the user IDs"
+msgstr "Kui te soovite allkirjastada KÕIK kasutaja IDd, vastake \"jah\""
+
+#: g10/helptext.c:168
+msgid ""
+"Answer \"yes\" if you really want to delete this user ID.\n"
+"All certificates are then also lost!"
+msgstr ""
+"Kui te tõesti soovite seda kasutaja IDd kustutada, vastake \"jah\".\n"
+"Sertifikaadid kustutatakse samuti!"
+
+#: g10/helptext.c:173
+msgid "Answer \"yes\" if it is okay to delete the subkey"
+msgstr "Kui selle alamvõtme võib kustutada, vastake \"jah\""
+
+#: g10/helptext.c:178
+msgid ""
+"This is a valid signature on the key; you normally don't want\n"
+"to delete this signature because it may be important to establish a\n"
+"trust connection to the key or another key certified by this key."
+msgstr ""
+"See on võtme kehtiv allkiri; tavaliselt seda ei soovita kustutada,\n"
+"kuna see allkiri võib olla vajalik, et kirjeldada antud võtme või\n"
+"antud võtmega sertifitseeritud teise võtme usaldatavust."
+
+#: g10/helptext.c:183
+msgid ""
+"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."
+msgstr ""
+"Seda allkirja ei saa kontrollida, kuna puudub allkirjale vastav võti.\n"
+"Te peaksite peatama kustutamise, kuni on teada, millist võtit see\n"
+"kasutab, sest see võti võib moodustada usaldussuhte läbi mõne juba\n"
+"sertifitseeritud võtme."
+
+#: g10/helptext.c:189
+msgid ""
+"The signature is not valid.  It does make sense to remove it from\n"
+"your keyring."
+msgstr "Allkiri ei ole kehtiv. Oleks mõistlik see võtmehoidlast kustutada."
+
+#: g10/helptext.c:193
+msgid ""
+"This is a signature which binds the user ID to the key. It is\n"
+"usually not a good idea to remove such a signature.  Actually\n"
+"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."
+msgstr ""
+"See allkiri seob kasutaja ID võtmega. Sellist allkirja ei ole\n"
+"üldiselt soovitatav eemaldada. Peale selle kustutamist ei pruugi\n"
+"GnuPG enam olla võimeline seda võtit leidma. Kustutada võiks\n"
+"vaid siis, kui see allkiri ei ole miskipärast kehtiv ja on\n"
+"olemas ka teine allkiri, mis kasutajat võtmega seob."
+
+#: g10/helptext.c:202
+msgid ""
+"Please enter the passhrase; this is a secret sentence \n"
+"  Blurb, blurb,.... "
+msgstr ""
+"Palun sisestage parool; see on salajane tekst\n"
+"  Blää, blää,.... "
+
+#: g10/helptext.c:209
+msgid "Please repeat the last passphrase, so you are sure what you typed in."
+msgstr "Palun korrake parooli, siis saate oma kirjutatus kindel olla."
+
+#: g10/helptext.c:213
+msgid "Give the name of the file to which the signature applies"
+msgstr "Sisestage palun failinimi, mida allkirjastada"
+
+#: g10/helptext.c:218
+msgid "Answer \"yes\" if it is okay to overwrite the file"
+msgstr "Vastake \"jah\", kui faili võib üle kirjutada"
+
+#: g10/helptext.c:223
+msgid ""
+"Please enter a new filename. If you just hit RETURN the default\n"
+"file (which is shown in brackets) will be used."
+msgstr ""
+"Palun sisestage uus failinimi. Kui te vajutate lihtsalt reavahetust,\n"
+"kasutatakse vaikimisi faili (nimi on nurksulgudes)."
+
+#: g10/helptext.c:229
+msgid ""
+"You should specify a reason for the certification.  Depending on the\n"
+"context you have the ability to choose from this list:\n"
+"  \"Key has been compromised\"\n"
+"      Use this if you have a reason to believe that unauthorized persons\n"
+"      got access to your secret key.\n"
+"  \"Key is superseded\"\n"
+"      Use this if you have replaced this key with a newer one.\n"
+"  \"Key is no longer used\"\n"
+"      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"
+msgstr ""
+"Te peate määrama sertifitseerimise põhjuse. Sõltuvalt kontekstist on\n"
+"teil võimalus valida üks järgnevaist:\n"
+"  \"Võti on kompromiteeritud\"\n"
+"      Kasutage seda, kui teil on põhjust uskuda, et autoriseerimata\n"
+"      isikud on saanud juurdepääsu teie salajasele võtmele.\n"
+"  \"Võti on asendatud\"\n"
+"      Kasutage seda, kui te olete selle võtme asendanud uuemaga.\n"
+"  \"Võti ei ole enam kasutusel\"\n"
+"      Kasutage seda, kui te ei kasuta enam seda võtit.\n"
+"  \"Kasutaja ID ei ole enam kehtiv\"\n"
+"      Kasutage seda märkimaks, et konkreetser kasutaja ID ei peaks enam\n"
+"      kasutama; seda kasutatakse tavaliselt märkimaks vigast e-posti "
+"aadressi.\n"
+
+#: g10/helptext.c:245
+msgid ""
+"If you like, you can enter a text describing why you issue this\n"
+"revocation certificate.  Please keep this text concise.\n"
+"An empty line ends the text.\n"
+msgstr ""
+"Kui te soovite, võite nüüd sisestada põhjenduse, miks te\n"
+"soovite seda tühistamise sertifikaati esitada. Palun kirjutage\n"
+"lühidalt. Tühi rida lõpetab teksti.\n"
+
+#: g10/helptext.c:260
+msgid "No help available"
+msgstr "Abiinfo puudub"
+
+#: g10/helptext.c:268
+#, c-format
+msgid "No help available for `%s'"
+msgstr "`%s' kohta abiinfo puudub"
+
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "selles versioonis ei saa RSA võtit kasutada\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "See kasutaja ID ei oma võtit\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Sel võtmel ei ole kasutaja ID\n"
+
+#~ msgid "invalid"
+#~ msgstr "vigane"
+
+#~ msgid "revoked"
+#~ msgstr "tühistatud"
+
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "lahtikrüptimiseks puudub salajane võti\n"
diff -urN gnupg-1.0.4/po/fr.po gnupg-1.0.5/po/fr.po
--- gnupg-1.0.4/po/fr.po	Tue Oct 17 15:40:37 2000
+++ gnupg-1.0.5/po/fr.po	Sun Apr 29 16:39:25 2001
@@ -1,17 +1,17 @@
 # GnuPG French translation
-# Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 # Gaël Quéri <gqueri@mail.dotcom.fr>, 1998.
 #
 # 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.26 2000/10/17 13:29:48 wkoch Exp $
+# $Id: fr.po,v 1.47.2.41 2001/04/29 14:08:11 werner Exp $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.0.1h\n"
-"POT-Creation-Date: 2000-10-16 19:22+0200\n"
-"PO-Revision-Date: 2000-06-28 18:41+02:00\n"
+"Project-Id-Version: gnupg 1.0.4t\n"
+"POT-Creation-Date: 2001-04-29 16:39+0200\n"
+"PO-Revision-Date: 2001-04-24 17:46+02:00\n"
 "Last-Translator: Gaël Quéri <gqueri@mail.dotcom.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -22,37 +22,37 @@
 msgid "Warning: using insecure memory!\n"
 msgstr "Avertissement: l'utilisation de la mémoire n'est pas sûre !\n"
 
-#: util/secmem.c:295
+#: util/secmem.c:299
 msgid "operation is not possible without initialized secure memory\n"
 msgstr ""
 "l'opération n'est pas possible tant que la mémoire sûre n'est pas\n"
 "initialisée\n"
 
-#: util/secmem.c:296
+#: util/secmem.c:300
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(vous avez peut-être utilisé un programme non adapté à cette fin)\n"
 
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:287 util/miscutil.c:316
 msgid "yes"
 msgstr "oui"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:288 util/miscutil.c:319
 msgid "yY"
 msgstr "oO"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:289 util/miscutil.c:317
 msgid "no"
 msgstr "non"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:290 util/miscutil.c:320
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:318
 msgid "quit"
 msgstr "quitter"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:321
 msgid "qQ"
 msgstr "qQ"
 
@@ -252,6 +252,15 @@
 msgid "not processed"
 msgstr "non traité"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+msgid "unusable public key"
+msgstr "clé publique inutilisable"
+
+#: util/errors.c:106
+msgid "unusable secret key"
+msgstr "clé secrète inutilisable"
+
 #: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -262,68 +271,68 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vous avez trouvé un bug... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:324
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossible d'accéder à `%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:329
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' n'est pas un fichier régulier - ignoré\n"
 
-#: cipher/random.c:325
+#: cipher/random.c:334
 msgid "note: random_seed file is empty\n"
 msgstr "note: le fichier `random_seed' est vide\n"
 
-#: cipher/random.c:331
+#: cipher/random.c:340
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 "avertissement: la taille du fichier `random_seed' est invalide.\n"
 "Celui-ci ne sera pas utilisé.\n"
 
-#: cipher/random.c:339
+#: cipher/random.c:348
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossible de lire `%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:386
 msgid "note: random_seed file not updated\n"
 msgstr "note: le fichier `random_seed' n'a pas été mis à jour\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:406
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossible de créer `%s': %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:413
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossible d'écrire `%s': %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:416
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossible de fermer `%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:427
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 "une quantité de données aléatoires trop importante a été demandée.\n"
 "La limite est %d bits.\n"
 
-#: cipher/random.c:650
+#: cipher/random.c:661
 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:651
+#: cipher/random.c:662
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -348,7 +357,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:206
+#: g10/g10.c:216
 msgid ""
 "@Commands:\n"
 " "
@@ -356,139 +365,139 @@
 "@Commandes:\n"
 " "
 
-#: g10/g10.c:208
+#: g10/g10.c:218
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/g10.c:209
+#: g10/g10.c:219
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/g10.c:210
+#: g10/g10.c:220
 msgid "make a detached signature"
 msgstr "faire une signature détachée"
 
-#: g10/g10.c:211
+#: g10/g10.c:221
 msgid "encrypt data"
 msgstr "chiffrer les données"
 
-#: g10/g10.c:212
+#: g10/g10.c:222
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement symétrique seulement"
 
-#: g10/g10.c:213
+#: g10/g10.c:223
 msgid "store only"
 msgstr "pas d'action"
 
-#: g10/g10.c:214
+#: g10/g10.c:224
 msgid "decrypt data (default)"
 msgstr "déchiffrer les données (défaut)"
 
-#: g10/g10.c:215
+#: g10/g10.c:225
 msgid "verify a signature"
 msgstr "vérifier une signature"
 
-#: g10/g10.c:217
+#: g10/g10.c:227
 msgid "list keys"
 msgstr "lister les clés"
 
-#: g10/g10.c:219
+#: g10/g10.c:229
 msgid "list keys and signatures"
 msgstr "lister les clés et les signatures"
 
-#: g10/g10.c:220
+#: g10/g10.c:230
 msgid "check key signatures"
 msgstr "vérifier les signatures des clés"
 
-#: g10/g10.c:221
+#: g10/g10.c:231
 msgid "list keys and fingerprints"
 msgstr "lister les clés et les empreintes"
 
-#: g10/g10.c:222
+#: g10/g10.c:232
 msgid "list secret keys"
 msgstr "lister les clés secrètes"
 
-#: g10/g10.c:223
+#: g10/g10.c:233
 msgid "generate a new key pair"
 msgstr "générer une nouvelle paire de clés"
 
-#: g10/g10.c:224
+#: g10/g10.c:234
 msgid "remove key from the public keyring"
 msgstr "enlever la clé du porte-clés public"
 
-#: g10/g10.c:226
+#: g10/g10.c:236
 msgid "remove key from the secret keyring"
 msgstr "enlever la clé du porte-clés secret"
 
-#: g10/g10.c:227
+#: g10/g10.c:237
 msgid "sign a key"
 msgstr "signer une clé"
 
-#: g10/g10.c:228
+#: g10/g10.c:238
 msgid "sign a key locally"
 msgstr "signer une clé localement"
 
-#: g10/g10.c:229
+#: g10/g10.c:239
 msgid "sign or edit a key"
 msgstr "signer ou éditer une clé"
 
-#: g10/g10.c:230
+#: g10/g10.c:240
 msgid "generate a revocation certificate"
 msgstr "générer un certificat de révocation"
 
-#: g10/g10.c:231
+#: g10/g10.c:241
 msgid "export keys"
 msgstr "exporter les clés"
 
-#: g10/g10.c:232
+#: g10/g10.c:242
 msgid "export keys to a key server"
 msgstr "exporter les clés vers un serveur de clés"
 
-#: g10/g10.c:233
+#: g10/g10.c:243
 msgid "import keys from a key server"
 msgstr "importer les clés d'un serveur de clés"
 
-#: g10/g10.c:237
+#: g10/g10.c:247
 msgid "import/merge keys"
 msgstr "importer/fusionner les clés"
 
-#: g10/g10.c:239
+#: g10/g10.c:249
 msgid "list only the sequence of packets"
 msgstr "ne lister que les paquets"
 
-#: g10/g10.c:241
+#: g10/g10.c:251
 msgid "export the ownertrust values"
 msgstr "exporter les indices de confiance"
 
-#: g10/g10.c:243
+#: g10/g10.c:253
 msgid "import ownertrust values"
 msgstr "importer les indices de confiance"
 
-#: g10/g10.c:245
+#: g10/g10.c:255
 msgid "update the trust database"
 msgstr "mettre la base de confiance à jour"
 
-#: g10/g10.c:247
+#: g10/g10.c:257
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMS]|vérifier la base de confiance"
 
-#: g10/g10.c:248
+#: g10/g10.c:258
 msgid "fix a corrupted trust database"
 msgstr "réparer une base de confiance corrompue"
 
-#: g10/g10.c:249
+#: g10/g10.c:259
 msgid "De-Armor a file or stdin"
 msgstr "Enlever l'armure d'un fichier ou de stdin"
 
-#: g10/g10.c:251
+#: g10/g10.c:261
 msgid "En-Armor a file or stdin"
 msgstr "Mettre une armure à un fichier ou à stdin"
 
-#: g10/g10.c:253
+#: g10/g10.c:263
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/g10.c:257
+#: g10/g10.c:267
 msgid ""
 "@\n"
 "Options:\n"
@@ -498,152 +507,156 @@
 "Options:\n"
 " "
 
-#: g10/g10.c:259
+#: g10/g10.c:269
 msgid "create ascii armored output"
 msgstr "créer une sortie ascii avec armure"
 
-#: g10/g10.c:261
+#: g10/g10.c:271
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/g10.c:264
+#: g10/g10.c:274
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOM|utiliser NOM comme récipient par défaut"
 
-#: g10/g10.c:266
+#: g10/g10.c:276
 msgid "use the default key as default recipient"
 msgstr "utiliser la clé par déf. comme récipient"
 
-#: g10/g10.c:270
+#: g10/g10.c:280
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou déchiffrer"
 
-#: g10/g10.c:271
+#: g10/g10.c:281
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 désactive)"
 
-#: g10/g10.c:273
+#: g10/g10.c:283
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/g10.c:274
+#: g10/g10.c:284
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/g10.c:275
+#: g10/g10.c:285
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/g10.c:276
+#: g10/g10.c:286
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: g10/g10.c:277
+#: g10/g10.c:287
 msgid "don't use the terminal at all"
 msgstr "ne pas utiliser du tout le terminal"
 
-#: g10/g10.c:278
+#: g10/g10.c:288
 msgid "force v3 signatures"
 msgstr "forcer les signatures en v3"
 
-#: g10/g10.c:279
+#: g10/g10.c:289
 msgid "always use a MDC for encryption"
 msgstr "toujours utiliser un sceau pour le chiffrement"
 
-#: g10/g10.c:280
+#: g10/g10.c:290
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:282
+#: g10/g10.c:292
+msgid "use the gpg-agent"
+msgstr "utiliser gpg-agent"
+
+#: g10/g10.c:293
 msgid "batch mode: never ask"
 msgstr "mode automatique: ne jamais rien demander"
 
-#: g10/g10.c:283
+#: g10/g10.c:294
 msgid "assume yes on most questions"
 msgstr "répondre oui à la plupart des questions"
 
-#: g10/g10.c:284
+#: g10/g10.c:295
 msgid "assume no on most questions"
 msgstr "répondre non à la plupart des questions"
 
-#: g10/g10.c:285
+#: g10/g10.c:296
 msgid "add this keyring to the list of keyrings"
 msgstr "ajouter ce porte-clés à la liste"
 
-#: g10/g10.c:286
+#: g10/g10.c:297
 msgid "add this secret keyring to the list"
 msgstr "ajouter ce porte-clés secret à la liste"
 
-#: g10/g10.c:287
+#: g10/g10.c:298
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|utiliser NOM comme clé secrète par défaut"
 
-#: g10/g10.c:288
+#: g10/g10.c:299
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HÔTE|utiliser ce serveur pour chercher des clés"
 
-#: g10/g10.c:289
+#: g10/g10.c:300
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|le terminal utilise la table de caractères NOM"
 
-#: g10/g10.c:290
+#: g10/g10.c:301
 msgid "read options from file"
 msgstr "lire les options du fichier"
 
-#: g10/g10.c:294
+#: g10/g10.c:305
 msgid "|FD|write status info to this FD"
 msgstr "|FD|écrire l'état sur ce descripteur"
 
-#: g10/g10.c:299
+#: g10/g10.c:310
 msgid "|KEYID|ulimately trust this key"
-msgstr ""
+msgstr "|IDCLÉ|donner une confiance ultime à cette clé"
 
-#: g10/g10.c:300
+#: g10/g10.c:311
 msgid "|FILE|load extension module FILE"
 msgstr "|FICH|charger le module d'extension FICH"
 
-#: g10/g10.c:301
+#: g10/g10.c:312
 msgid "emulate the mode described in RFC1991"
 msgstr "imiter le mode décrit dans la RFC1991"
 
-#: g10/g10.c:302
+#: g10/g10.c:313
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "utiliser le comportement défini par OpenPGP"
 
-#: g10/g10.c:303
+#: g10/g10.c:314
 msgid "|N|use passphrase mode N"
 msgstr "|N|coder les mots de passe suivant le mode N"
 
-#: g10/g10.c:305
+#: g10/g10.c:316
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
 
-#: g10/g10.c:307
+#: g10/g10.c:318
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
 
-#: g10/g10.c:308
+#: g10/g10.c:319
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
 
-#: g10/g10.c:309
+#: g10/g10.c:320
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|utiliser la fonction de hachage NOM"
 
-#: g10/g10.c:310
+#: g10/g10.c:321
 msgid "|N|use compress algorithm N"
 msgstr "|N|utiliser l'algorithme de compression N"
 
-#: g10/g10.c:311
+#: g10/g10.c:322
 msgid "throw keyid field of encrypted packets"
 msgstr "supprimer l'ident. des paquets chiffrés"
 
-#: g10/g10.c:312
+#: g10/g10.c:323
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOM=VALEUR|utiliser ces données de notation"
 
-#: g10/g10.c:315
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -651,7 +664,7 @@
 "@\n"
 "(Voir la page de manuel pour une liste complète des commandes et options)\n"
 
-#: g10/g10.c:318
+#: g10/g10.c:329
 msgid ""
 "@\n"
 "Examples:\n"
@@ -671,17 +684,17 @@
 " --list-keys [utilisateur]    montrer les clés\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/g10.c:418
+#: g10/g10.c:438
 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:422
+#: g10/g10.c:442
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/g10.c:425
+#: g10/g10.c:445
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -691,7 +704,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:432
+#: g10/g10.c:452
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -699,188 +712,192 @@
 "\n"
 "Algorithmes supportés:\n"
 
-#: g10/g10.c:511
+#: g10/g10.c:531
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/g10.c:564
+#: g10/g10.c:584
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/g10.c:704
+#: g10/g10.c:734
 #, 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:708
+#: g10/g10.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/g10.c:715
+#: g10/g10.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:905
+#: g10/g10.c:950
 #, 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:970
+#: g10/g10.c:1024
 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
+#: g10/g10.c:1028 g10/g10.c:1037
 #, 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:976
+#: g10/g10.c:1030
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/g10.c:979
+#: g10/g10.c:1033
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/g10.c:998 g10/g10.c:1010
+#: g10/g10.c:1053 g10/g10.c:1065
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement sélectionné est invalide\n"
 
-#: g10/g10.c:1004 g10/g10.c:1016
+#: g10/g10.c:1059 g10/g10.c:1071
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage sélectionnée est invalide\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1075
 msgid "the given policy URL is invalid\n"
 msgstr "l'URL de politique donnée est invalide\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1078
 #, 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:1025
+#: g10/g10.c:1080
 msgid "completes-needed must be greater than 0\n"
 msgstr "«completes-needed» doit être supérieur à 0\n"
 
-#: g10/g10.c:1027
+#: g10/g10.c:1082
 msgid "marginals-needed must be greater than 1\n"
 msgstr "«marginals-needed» doit être supérieur à 1\n"
 
-#: g10/g10.c:1029
+#: g10/g10.c:1084
 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:1032
+#: g10/g10.c:1087
 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:1036
+#: g10/g10.c:1091
 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:1121
+#: g10/g10.c:1176
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/g10.c:1127
+#: g10/g10.c:1182
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:1134
+#: g10/g10.c:1189
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:1142
+#: g10/g10.c:1197
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1210
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1223
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1237
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:1199
+#: g10/g10.c:1254
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1262
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1270
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1278
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/g10.c:1239
+#: g10/g10.c:1294
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key utilisateur"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1297
 msgid "--delete-key user-id"
 msgstr "--delete-key utilisateur"
 
-#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
+#: g10/g10.c:1305
+msgid "--delete-secret-and-public-key user-id"
+msgstr "--delete-secret-and-public-key utilisateur"
+
+#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossible d'ouvrir %s: %s\n"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1357
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-clés]"
 
-#: g10/g10.c:1360
+#: g10/g10.c:1423
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a échoué: %s\n"
 
-#: g10/g10.c:1368
+#: g10/g10.c:1431
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a échoué: %s \n"
 
-#: g10/g10.c:1439
+#: g10/g10.c:1502
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:1520
+#: g10/g10.c:1589
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:1524
+#: g10/g10.c:1593
 msgid "Go ahead and type your message ...\n"
-msgstr "Continuez et tapez votre message...\n"
+msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
 
-#: g10/g10.c:1737
+#: g10/g10.c:1805
 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:1743
+#: g10/g10.c:1811
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -889,89 +906,89 @@
 "des points ou des traits de soulignement et doit se terminer par un signe "
 "égal\n"
 
-#: g10/g10.c:1749
+#: g10/g10.c:1817
 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:1757
+#: g10/g10.c:1825
 msgid "a notation value must not use any control characters\n"
 msgstr "une valeur de notation ne doit utiliser aucun caractère de contrôle\n"
 
-#: g10/armor.c:302
+#: g10/armor.c:306
 #, c-format
 msgid "armor: %s\n"
 msgstr "armure: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:335
 msgid "invalid armor header: "
 msgstr "en-tête d'armure invalide: "
 
-#: g10/armor.c:338
+#: g10/armor.c:342
 msgid "armor header: "
 msgstr "en-tête d'armure: "
 
-#: g10/armor.c:349
+#: g10/armor.c:353
 msgid "invalid clearsig header\n"
 msgstr "en-tête de signature claire invalide\n"
 
-#: g10/armor.c:401
+#: g10/armor.c:405
 msgid "nested clear text signatures\n"
 msgstr "signatures en texte clair imbriquées\n"
 
-#: g10/armor.c:525
+#: g10/armor.c:529
 msgid "invalid dash escaped line: "
 msgstr "ligne échappée par `-' invalide: "
 
-#: g10/armor.c:537
+#: g10/armor.c:541
 msgid "unexpected armor:"
 msgstr "armure inattendue:"
 
-#: g10/armor.c:654
+#: g10/armor.c:667 g10/armor.c:1235
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caractère %02x invalide en base 64 ignoré\n"
 
-#: g10/armor.c:697
+#: g10/armor.c:710
 msgid "premature eof (no CRC)\n"
 msgstr "fin de fichier prématurée (pas de CRC)\n"
 
-#: g10/armor.c:731
+#: g10/armor.c:744
 msgid "premature eof (in CRC)\n"
 msgstr "fin de fichier prématurée (dans le CRC)\n"
 
-#: g10/armor.c:735
+#: g10/armor.c:748
 msgid "malformed CRC\n"
 msgstr "CRC déformé\n"
 
-#: g10/armor.c:739
+#: g10/armor.c:752 g10/armor.c:1272
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "Erreur de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:772
 msgid "premature eof (in Trailer)\n"
 msgstr "fin de fichier prématurée (dans la remorque)\n"
 
-#: g10/armor.c:760
+#: g10/armor.c:776
 msgid "error in trailer line\n"
 msgstr "erreur dans la ligne de remorque\n"
 
-#: g10/armor.c:906
+#: g10/armor.c:922
 msgid "For info see http://www.gnupg.org"
 msgstr "Pour information voir http://www.gnupg.org"
 
-#: g10/armor.c:1027
+#: g10/armor.c:1050
 msgid "no valid OpenPGP data found.\n"
 msgstr "aucune donnée OpenPGP valide n'a été trouvée.\n"
 
-#: g10/armor.c:1032
+#: g10/armor.c:1055
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armure invalide: ligne plus longue que %d caractères\n"
 
-#: g10/armor.c:1036
+#: g10/armor.c:1059
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -980,7 +997,7 @@
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "               Empreinte:"
 
@@ -1212,17 +1229,17 @@
 "            Il n'est pas sûr que la signature appartient à son "
 "propriétaire.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignoré: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignoré: clé publique déjà présente\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1230,42 +1247,42 @@
 "Vous n'avez pas spécifié de nom d'utilisateur. (vous pouvez utiliser «-r»)\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "Entrez le nom d'utilisateur: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "Pas d'utilisateur de ce nom.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignoré: la clé publique est déjà le récipient par défaut\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
 msgstr "La clé publique est désactivée.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignoré: clé publique configurée par --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "récipient par défaut `%s' inconnu\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: erreur pendant la vérification de la clé: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignoré: la clé publique est désactivée\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "pas de destinataire valide\n"
 
@@ -1275,62 +1292,68 @@
 msgstr "écriture de l'auto-signature\n"
 
 # g10/keygen.c:161 ???
-#: g10/keygen.c:214
+#: g10/keygen.c:217
 msgid "writing key binding signature\n"
 msgstr "écriture de la signature de liaison\n"
 
-#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
+#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Taille invalide; utilisation de %u bits\n"
 
-#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
+#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie à %u bits\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:549
 msgid "Please select what kind of key you want:\n"
 msgstr "Sélectionnez le type de clé désiré:\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:551
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA et ElGamal (par défaut)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:552
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:554
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (chiffrement seul)\n"
 
-#: g10/keygen.c:546
+#: g10/keygen.c:555
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signature et chiffrement)\n"
 
-#: g10/keygen.c:548
+#: g10/keygen.c:557
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (signature et chiffrement)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:561
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
-#: g10/keygen.c:563 g10/keygen.c:571
+#: g10/keygen.c:572
 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:585
+#: g10/keygen.c:580
+msgid "The use of this algorithm is deprecated - create anyway? "
+msgstr ""
+"L'utilisation de cet algorithme est déconseillé - faut-il quand-même\n"
+"créer la clé ?"
+
+#: g10/keygen.c:594
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
-#: g10/keygen.c:597
+#: g10/keygen.c:606
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1343,19 +1366,19 @@
 "          la taille par défaut est 1024 bits\n"
 " la taille maximale conseillée est 2048 bits\n"
 
-#: g10/keygen.c:604
+#: g10/keygen.c:613
 msgid "What keysize do you want? (1024) "
 msgstr "Quelle taille de clé désirez-vous ? (1024) "
 
-#: g10/keygen.c:609
+#: g10/keygen.c:618
 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:611
+#: g10/keygen.c:620
 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:613
+#: g10/keygen.c:622
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "taille trop petite; 1024 est la plus petite valeur permise pour RSA.\n"
 
@@ -1367,12 +1390,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:624
+#: g10/keygen.c:633
 #, 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:629
+#: g10/keygen.c:638
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1380,11 +1403,11 @@
 "Les tailles supérieures à 2048 ne sont pas conseillées car\n"
 "les calculs prennent VRAIMENT beaucoup de temps !\n"
 
-#: g10/keygen.c:632
+#: g10/keygen.c:641
 msgid "Are you sure that you want this keysize? "
 msgstr "Etes-vous sûr de vouloir cette taille ? "
 
-#: g10/keygen.c:633
+#: g10/keygen.c:642
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1392,21 +1415,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:641
+#: g10/keygen.c:650
 msgid "Do you really need such a large keysize? "
 msgstr "Avez-vous réellement besoin d'une taille aussi grande ? "
 
-#: g10/keygen.c:647
+#: g10/keygen.c:656
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demandée est %u bits\n"
 
-#: g10/keygen.c:650 g10/keygen.c:654
+#: g10/keygen.c:659 g10/keygen.c:663
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie à %u bits\n"
 
-#: g10/keygen.c:702
+#: g10/keygen.c:711
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1422,25 +1445,25 @@
 "      <n>m = la clé expire dans n mois\n"
 "      <n>y = la clé expire dans n ans\n"
 
-#: g10/keygen.c:717
+#: g10/keygen.c:726
 msgid "Key is valid for? (0) "
 msgstr "La clé est valide pour ? (0) "
 
-#: g10/keygen.c:722
+#: g10/keygen.c:731
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:727
+#: g10/keygen.c:736
 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:733
+#: g10/keygen.c:742
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clé expire le %s\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:745
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1448,11 +1471,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:741
+#: g10/keygen.c:750
 msgid "Is this correct (y/n)? "
 msgstr "Est-ce correct (o/n) ? "
 
-#: g10/keygen.c:784
+#: g10/keygen.c:793
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1468,44 +1491,44 @@
 "   « Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de> »\n"
 "\n"
 
-#: g10/keygen.c:796
+#: g10/keygen.c:805
 msgid "Real name: "
 msgstr "Nom réel: "
 
-#: g10/keygen.c:804
+#: g10/keygen.c:813
 msgid "Invalid character in name\n"
 msgstr "Caractère invalide dans le nom\n"
 
-#: g10/keygen.c:806
+#: g10/keygen.c:815
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:808
+#: g10/keygen.c:817
 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:816
+#: g10/keygen.c:825
 msgid "Email address: "
 msgstr "Adresse e-mail: "
 
-#: g10/keygen.c:827
+#: g10/keygen.c:836
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:835
+#: g10/keygen.c:844
 msgid "Comment: "
 msgstr "Commentaire: "
 
-#: g10/keygen.c:841
+#: g10/keygen.c:850
 msgid "Invalid character in comment\n"
 msgstr "Caractère invalide dans le commentaire\n"
 
-#: g10/keygen.c:864
+#: g10/keygen.c:873
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caractères '%s'.\n"
 
-#: g10/keygen.c:870
+#: g10/keygen.c:879
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1516,28 +1539,28 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:883
 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:879
+#: g10/keygen.c:888
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:889
+#: g10/keygen.c:898
 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:890
+#: g10/keygen.c:899
 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:909
+#: g10/keygen.c:918
 msgid "Please correct the error first\n"
 msgstr "Corrigez l'erreur d'abord\n"
 
-#: g10/keygen.c:947
+#: g10/keygen.c:956
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1545,11 +1568,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:955
+#: g10/keyedit.c:469 g10/keygen.c:964
 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:961
+#: g10/keygen.c:970
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1561,7 +1584,7 @@
 "le désirez, en utilisant ce programme avec l'option « --edit-key ».\n"
 "\n"
 
-#: g10/keygen.c:982
+#: g10/keygen.c:991
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1573,29 +1596,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:1431
+#: g10/keygen.c:1440
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La paire de clés DSA fera 1024 bits.\n"
 
-#: g10/keygen.c:1474
+#: g10/keygen.c:1483
 msgid "Key generation canceled.\n"
 msgstr "La génération de clé a été annulée.\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1581
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "écriture de la clé publique vers `%s'\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1582
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "écriture de la clé secrète vers `%s'\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1679
 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:1673
+#: g10/keygen.c:1684
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1604,13 +1627,13 @@
 "utiliser la commande «--edit-key» pour générer une clé secondaire à\n"
 "cette fin.\n"
 
-#: g10/keygen.c:1690 g10/keygen.c:1791
+#: g10/keygen.c:1701 g10/keygen.c:1807
 #, 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:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1748 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1618,7 +1641,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:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1750 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1626,11 +1649,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:1769
+#: g10/keygen.c:1783
 msgid "Really create? "
 msgstr "Créer vraiment ? "
 
-#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1641,17 +1664,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:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATTENTION: fichier vide\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lecture de `%s'\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s chiffré pour: %s\n"
@@ -1676,283 +1699,283 @@
 msgid "key %08lX: not protected - skipped\n"
 msgstr "clé %08lX: non protégée - ignorée\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENTION: rien n'a été exporté\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:214
 msgid "too many entries in pk cache - disabled\n"
 msgstr "trop d'entrées dans le cache pk - désactivé\n"
 
-#: g10/getkey.c:350
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+msgid "[User id not found]"
+msgstr "[Nom utilisateur introuvable]"
+
+#: g10/getkey.c:453
 msgid "too many entries in unk cache - disabled\n"
 msgstr "trop d'entrées dans le cache unk - désactivé\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr "les clés RSA ne peuvent être utilisées dans cette version\n"
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
-msgstr "Pas de clé pour l'utilisateur\n"
-
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
-msgstr "Pas d'utilisateur pour la clé\n"
-
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2207
 #, 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:2050
-msgid "[User id not found]"
-msgstr "[Nom utilisateur introuvable]"
+#: g10/getkey.c:2249 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/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "un bloc de type %d a été ignoré\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 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:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "       Quantité totale traitée: %lu\n"
 
-#: g10/import.c:206
-#, fuzzy, c-format
+#: g10/import.c:208
+#, c-format
 msgid "      skipped new keys: %lu\n"
-msgstr "           nouvelles sous-clés: %lu\n"
+msgstr "       nouvelles clés ignorées: %lu\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        sans nom d'utilisateur: %lu\n"
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      importée: %lu"
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                     inchangée: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "  nouveaux noms d'utilisateurs: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nouvelles sous-clés: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "          nouvelles signatures: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " nouvelles révocations de clés: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "            clés secrètes lues: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "       clés secrètes importées: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      clés secrètes inchangées: %lu\n"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "clé %08lX: pas de nom d'utilisateur\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "clé %08lX: pas de nom d'utilisateur valide\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela peut provenir d'une auto-signature manquante\n"
 
-#: g10/import.c:418 g10/import.c:657
+#: g10/import.c:435 g10/import.c:684
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "clé %08lX: clé publique pas trouvée: %s\n"
 
-#: g10/import.c:423
-#, fuzzy, c-format
+#: g10/import.c:440
+#, c-format
 msgid "key %08lX: new key - skipped\n"
-msgstr "clé %08lX: ce n'est pas une clé rfc2440 - ignorée\n"
+msgstr "clé %08lX: nouvelle clé - ignorée\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "pas de porte-clés public par défaut\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "écriture de `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "impossible de verrouiller le porte-clés `%s': %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erreur durant l'écriture du porte-clés `%s': %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "clé %08lX: clé publique importée\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "clé %08lX: ne ressemble pas à notre copie\n"
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:489 g10/import.c:692
 #, 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:478 g10/import.c:671
+#: g10/import.c:495 g10/import.c:698
 #, 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:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "clé %08lX: un nouvel utilisateur\n"
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "clé %08lX: %d nouveaux utilisateurs\n"
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "clé %08lX: une nouvelle signature\n"
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "clé %08lX: %d nouvelles signatures\n"
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "clé %08lX: une nouvelle sous-clé\n"
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "clé %08lX: %d nouvelles sous-clés\n"
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "clé %08lX: n'a pas changé\n"
 
-#: g10/import.c:613
+#: g10/import.c:610
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr "clé secrète %08lX non importée (utilisez %s pour l'accepter)\n"
+
+#: g10/import.c:640
 #, 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:617
+#: g10/import.c:644
 #, 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:622
+#: g10/import.c:649
 #, 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:651
+#: g10/import.c:678
 #, 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:682
+#: g10/import.c:709
 #, 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:714
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "clé %08lX: certificat de révocation importé\n"
 
-#: g10/import.c:756
+#: g10/import.c:783
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "clé %08lX: pas d'utilisateur pour la signature\n"
 
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:790 g10/import.c:814
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "clé %08lX: algorithme de clé publique non supporté\n"
 
-#: g10/import.c:764
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "clé %08lX: auto-signature invalide\n"
 
-#: g10/import.c:779
+#: g10/import.c:806
 #, 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:788
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "clé %08lX: liaison avec la sous-clé invalide\n"
 
-#: g10/import.c:815
+#: g10/import.c:842
 #, 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:844
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "clé %08lX: utilisateur non pris en compte: '"
 
-#: g10/import.c:867
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "clé %08lX: sous-clé non prise en compte\n"
@@ -1961,98 +1984,98 @@
 #. * 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:892
+#: g10/import.c:919
 #, 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:901
+#: g10/import.c:928
 #, 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:909
+#: g10/import.c:936
 #, 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:1009
+#: g10/import.c:1036
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "clé %08lX: nom d'utilisateur en double fusionné\n"
 
-#: g10/import.c:1060
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "clé %08lX: certificat de révocation ajouté\n"
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "clé %08lX: notre copie n'a pas d'auto-signature\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: utilisateur non trouvé\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr "[révocation]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr "[auto-signature]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
 msgstr "une mauvaise signature\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d mauvaises signatures\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
 msgstr "une signature non vérifiée à cause d'une clé manquante\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signatures non vérifiées à cause de clés manquantes\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
 msgstr "une signature non vérifiée à cause d'une erreur\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signatures non vérifiées à cause d'erreurs\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "un nom d'utilisateur sans auto-signature valide détecté\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d nom d'utilisateurs sans auto-signature valide détecté\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Déjà signé par la clé %08lX\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Rien à signer avec la clé %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2060,7 +2083,7 @@
 "Etes-vous vraiment sûr(e) que vous voulez signer cette clé\n"
 "avec la vôtre: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2068,39 +2091,39 @@
 "La signature sera marquée comme non-exportable.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "Signer réellement ? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a échoué: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "Cette clé n'est pas protégée.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:432
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parties secrètes de la clé principale ne sont pas disponibles.\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "La clé est protégée.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossible d'éditer cette clé: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr "Entrez le nouveau mot de passe pour cette clé secrète.\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2109,422 +2132,426 @@
 "*mauvaise* idée\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "Voulez-vous vraiment faire cela ? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr "replacer la signature d'une clé à l'endroit correct\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr "enregistrer"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "afficher cette aide"
 
 # g10/keyedit.c:556 ???
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr "afficher l'empreinte"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr "lister"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
 msgstr "lister la clé et les noms d'utilisateurs"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
 msgstr "sélectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr "clé"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "sélectionner la clé secondaire N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr "vérifier"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr "lister les signatures"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr "signer"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr "signer la clé"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr "lsigner"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
 msgstr "signer la clé localement"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr "déboguer"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr "aj.ut"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
 msgstr "ajouter un utilisateur"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr "suppr.ut"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
 msgstr "enlever un utilisateur"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr "aj.clé"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr "ajouter une clé secondaire"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr "suppr.clé"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "enlever une clé secondaire"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
 msgstr "suppr.sign"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
 msgstr "supprimer les signatures"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr "changer la date d'expiration"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr "changer"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "passer de la liste des clés secrètes aux clés privées et inversement"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr "préf"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606 g10/keyedit.c:607
 msgid "list preferences"
 msgstr "lister les préférences"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "préf"
+
+#: g10/keyedit.c:608
 msgid "passwd"
 msgstr "mot.pas"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:608
 msgid "change the passphrase"
 msgstr "changer le mot de passe"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "trust"
 msgstr "confi."
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "change the ownertrust"
 msgstr "changer la confiance"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revoke signatures"
 msgstr "révoquer les signatures"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revkey"
 msgstr "revclé"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revoke a secondary key"
 msgstr "révoquer une clé secondaire"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable"
 msgstr "désactiver"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable a key"
 msgstr "désactiver une clé"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable"
 msgstr "activer"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable a key"
 msgstr "activer une clé"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:633
 msgid "can't do that in batchmode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:669
+#: g10/keyedit.c:671
 msgid "Secret key is available.\n"
 msgstr "La clé secrète est disponible.\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:700
 msgid "Command> "
 msgstr "Commande> "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 msgid "Need the secret key to do this.\n"
 msgstr "Il faut la clé secrète pour faire cela.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Utilisez la commande «toggle» d'abord.\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:781
 msgid "Really sign all user IDs? "
 msgstr "Signer vraiment tous les utilisateurs ? "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:782
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Aide: Sélectionner les utilisateurs à signer\n"
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:814 g10/keyedit.c:1000
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "la mise à jour de la base de confiance a échoué: %s\n"
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:825 g10/keyedit.c:846
 msgid "You must select at least one user ID.\n"
 msgstr "Vous devez sélectionner au moins un utilisateur.\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:827
 msgid "You can't delete the last user ID!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:830
 msgid "Really remove all selected user IDs? "
 msgstr "Enlever réellement tous les utilisateurs sélectionnés ? "
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:831
 msgid "Really remove this user ID? "
 msgstr "Enlever réellement cet utilisateur ? "
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:867 g10/keyedit.c:889
 msgid "You must select at least one key.\n"
 msgstr "Vous devez sélectionner au moins une clé.\n"
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:871
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voulez-vous vraiment supprimer les clés sélectionnées ? "
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:872
 msgid "Do you really want to delete this key? "
 msgstr "Voulez-vous vraiment supprimer cette clé ? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Voulez-vous vraiment révoquer les clés sélectionnées ? "
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:894
 msgid "Do you really want to revoke this key? "
 msgstr "Voulez-vous vraiment révoquer cette clé ? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
 msgid "Save changes? "
 msgstr "Enregistrer les changements? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:967
 msgid "Quit without saving? "
 msgstr "Quitter sans enregistrer? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:978
 #, c-format
 msgid "update failed: %s\n"
 msgstr "la mise à jour a échoué: %s\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:985
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "la mise à jour de la clé secrète a échoué: %s\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:992
 msgid "Key not changed so no update needed.\n"
 msgstr "La clé n'a pas changé donc la mise à jour est inutile.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1007
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez «help»)\n"
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
-msgstr ""
+msgstr "%s%c %4u%c/%08lX  créée: %s expire: %s"
 
-#: g10/keyedit.c:1090
+#: g10/keyedit.c:1140
 #, c-format
 msgid " trust: %c/%c"
-msgstr ""
+msgstr " confiance: %c/%c"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1144
 msgid "This key has been disabled"
 msgstr "Cette clé a été désactivée"
 
-#: g10/keyedit.c:1123
-#, fuzzy, c-format
+#: g10/keyedit.c:1173
+#, c-format
 msgid "rev! subkey has been revoked: %s\n"
-msgstr "clé %08lX: la sous-clé a été révoquée !\n"
+msgstr "rev! la sous-clé a été révoquée: %s\n"
 
-#: g10/keyedit.c:1126
-#, fuzzy
+#: g10/keyedit.c:1176
 msgid "rev- faked revocation found\n"
-msgstr " nouvelles révocations de clés: %lu\n"
+msgstr "rev- une révocation truquée a été trouvée\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1178
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
-msgstr ""
+msgstr "rev? problème de vérification de la révocation: %s\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1420
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1424
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1428
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1434
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1448
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprimée.\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1449
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprimées\n"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1452
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a été supprimé.\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les sélections des clés secrètes.\n"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1527
 msgid "Please select at most one secondary key.\n"
 msgstr "Vous devez sélectionner au plus une clé secondaire.\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1531
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Changer la date d'expiration d'une clé secondaire.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la clé principale.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1575
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vous ne pouvez pas changer la date d'expiration d'une clé v3\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1591
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-clés secret\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1652
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1698
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Pas de clé secondaire avec l'index %d\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1796
 msgid "user ID: \""
 msgstr "nom d'utilisateur: «"
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1799
 #, c-format
 msgid ""
 "\"\n"
@@ -2533,170 +2560,166 @@
 "»\n"
 "signé avec votre clé %08lX à %s\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1803
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Générer un certificat de révocation pour cette signature ? (o/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1827
 msgid "You have signed these user IDs:\n"
 msgstr "Vous avez signé ces noms d'utilisateurs:\n"
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   signé par %08lX à %s\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1846
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   révoqué par %08lX à %s\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1866
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous êtes sur le point de révoquer ces signatures:\n"
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1884
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Faut-il vraiment générer les certificats de révocation ? (o/N)"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1913
 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:400 g10/mainproc.c:790
+#: g10/keylist.c:279 g10/mainproc.c:851
 #, c-format
 msgid " [expires: %s]"
 msgstr " [expire: %s]"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:269
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la clé publique est %08lX\n"
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:314
 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:326
+#: g10/mainproc.c:366
 #, 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:336
+#: g10/mainproc.c:376
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "chiffré avec une clé %s, %08lX\n"
 
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr "aucune clé secrète n'est disponible pour le déchiffrement\n"
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:390
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "le déchiffrement par clé publique a échoué: %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:430
 msgid "decryption okay\n"
 msgstr "le déchiffrement a réussi\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:435
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENTION: le message chiffré a été manipulé !\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:440
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le déchiffrement a échoué: %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:459
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE: l'expéditeur a demandé «pour vos yeux seulement»\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:461
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original: '%.*s'\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:632
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "révocation autonome - utilisez «gpg --import» pour l'appliquer\n"
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:719 g10/mainproc.c:728
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENTION: des données de notation invalides ont été détectées\n"
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:731
 msgid "Notation: "
 msgstr "Notation: "
 
-#: g10/mainproc.c:680
+#: g10/mainproc.c:740
 msgid "Policy: "
 msgstr "Politique: "
 
-#: g10/mainproc.c:1121
+#: g10/mainproc.c:1193
 msgid "signature verification suppressed\n"
 msgstr "vérification de signature supprimée\n"
 
-#: g10/mainproc.c:1158
+#. plaintext before signatures but no one-pass packets
+#: g10/mainproc.c:1235 g10/mainproc.c:1245
+msgid "can't handle these multiple signatures\n"
+msgstr "le traitement de ces signatures multiples est impossible\n"
+
+#: g10/mainproc.c:1256
 #, 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:1184 g10/mainproc.c:1195
+#: g10/mainproc.c:1284 g10/mainproc.c:1292
 msgid "BAD signature from \""
 msgstr "MAUVAISE signature de \""
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1196
+#: g10/mainproc.c:1285 g10/mainproc.c:1293
 msgid "Good signature from \""
 msgstr "Bonne signature de \""
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1243
+#: g10/mainproc.c:1358
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de vérifier la signature: %s\n"
 
-#: g10/mainproc.c:1318
+#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+msgid "not a detached signature\n"
+msgstr "la signature n'est pas détachée\n"
+
+#: g10/mainproc.c:1454
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1511
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1518
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide détecté dans proc_tree()\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, 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:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Les algorithmes expérimentaux ne devraient pas être utilisés !\n"
 
-#: g10/misc.c:234
-msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
+#: g10/misc.c:238
+#, fuzzy
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
 "Cet algorithme de chiffrement est déconseillé; utilisez-en un\n"
 "plus standard !\n"
@@ -2706,12 +2729,67 @@
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossible de gérer l'algorithme à clé publique %d\n"
 
-#: g10/parse-packet.c:991
+#: g10/parse-packet.c:1010
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un sous-paquet de type %d possède un bit critique\n"
 
-#: g10/passphrase.c:159
+#: g10/passphrase.c:223
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent n'est pas disponible dans cette session\n"
+
+#: g10/passphrase.c:229
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "la variable d'environnement GPG_AGENT_INFO est mal définie\n"
+
+#: g10/hkp.c:167 g10/passphrase.c:248
+#, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "impossible de se connecter à `%s': %s\n"
+
+#: g10/passphrase.c:313 g10/passphrase.c:576
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr " (ID clé principale %08lX)"
+
+#: g10/passphrase.c:323
+#, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"Vous avez besoin d'un mot de passe pour déverrouiller la clé secrète pour\n"
+"l'utilisateur:\n"
+"\"%.*s\"\n"
+"clé %u bits %s, ID %08lX, créée %s%s\n"
+
+#: g10/passphrase.c:344
+msgid "Enter passphrase\n"
+msgstr "Entrez le mot de passe\n"
+
+#: g10/passphrase.c:346
+msgid "Repeat passphrase\n"
+msgstr "Répétez le mot de passe\n"
+
+#: g10/passphrase.c:384
+msgid "passphrase too long\n"
+msgstr "mot de passe trop long\n"
+
+#: g10/passphrase.c:396
+msgid "invalid response from agent\n"
+msgstr "réponse de l'agent invalide\n"
+
+#: g10/passphrase.c:405
+msgid "cancelled by user\n"
+msgstr "annulé par l'utilisateur\n"
+
+#: g10/passphrase.c:408 g10/passphrase.c:477
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr "problème avec l'agent : l'agent renvoie 0x%lx\n"
+
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2721,25 +2799,20 @@
 "Vous avez besoin d'un mot de passe pour déverrouiller la clé secrète pour\n"
 "l'utilisateur: \""
 
-#: g10/passphrase.c:168
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "clé de %u bits %s, ID %08lX, créée le %s"
 
-#: g10/passphrase.c:173
-#, c-format
-msgid " (main key ID %08lX)"
-msgstr " (ID clé principale %08lX)"
-
-#: g10/passphrase.c:190
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
 msgstr "impossible de demander un mot de passe en mode automatique\n"
 
-#: g10/passphrase.c:194
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr "Entrez le mot de passe: "
 
-#: g10/passphrase.c:198
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr "Répétez le mot de passe: "
 
@@ -2749,19 +2822,23 @@
 "les données ne sont pas enregistrées; utilisez l'option «--output» pour\n"
 "les enregistrer\n"
 
-#: g10/plaintext.c:324
+#: g10/plaintext.c:332
 msgid "Detached signature.\n"
 msgstr "Signature détachée.\n"
 
-#: g10/plaintext.c:328
+#: g10/plaintext.c:336
 msgid "Please enter name of data file: "
 msgstr "Entrez le nom du fichier de données: "
 
-#: g10/plaintext.c:349
+#: g10/plaintext.c:357
 msgid "reading stdin ...\n"
 msgstr "lecture de l'entrée standard...\n"
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:391
+msgid "no signed data\n"
+msgstr "pas de données signées\n"
+
+#: g10/plaintext.c:399
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossible d'ouvir les données signées `%s'\n"
@@ -2796,41 +2873,36 @@
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTE: la clé secrète %08lX a expiré le %s\n"
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr "requête de la clé %08lX de %s...\n"
 
-#: g10/hkp.c:85
+#: g10/hkp.c:83
 #, 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:109 g10/hkp.c:148
+#: g10/hkp.c:102 g10/hkp.c:136
 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:117
+#: g10/hkp.c:110
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: l'identification de la clé est invalide\n"
 
-#: 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:194
+#: g10/hkp.c:191
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "erreur pendant l'envoi de `%s': %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:203
 #, 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:209
+#: g10/hkp.c:206
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "l'envoi à `%s' a échoué: le résultat est %u\n"
@@ -2873,32 +2945,37 @@
 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:324
+#: g10/sig-check.c:328
 #, c-format
-msgid "NOTE: signature key expired %s\n"
-msgstr "NOTE: la clé de signature a expiré le %s\n"
+msgid "NOTE: signature key %08lX expired %s\n"
+msgstr "NOTE: la clé de signature %08lX a expiré le %s\n"
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 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"
 "inconnu\n"
 
-#: g10/sign.c:140
+#: g10/sign.c:152
+#, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "Impossible de vérifier la signature créée: %s\n"
+
+#: g10/sign.c:161
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "Signature %s de: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:307 g10/sign.c:630
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossible de créer %s: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:405
 msgid "signing:"
 msgstr "signature:"
 
-#: g10/sign.c:431
+#: g10/sign.c:448
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENTION: `%s' est un fichier vide\n"
@@ -2938,7 +3015,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: le répertoire n'existe pas !\n"
 
-#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
+#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: impossible de créer: %s\n"
@@ -3090,9 +3167,9 @@
 msgstr "get_dir_record: search_record a échoué: %s\n"
 
 #: g10/trustdb.c:474
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid long keyID\n"
-msgstr "%s: l'identification de la clé est invalide\n"
+msgstr "'%s' n'est pas une identification de clé longue valide\n"
 
 #: g10/trustdb.c:501
 #, c-format
@@ -3115,20 +3192,15 @@
 msgstr "clé %08lX: acceptée comme clé certifiée.\n"
 
 #: g10/trustdb.c:546
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
-msgstr "clé %08lX: non protégée - ignorée\n"
+msgstr "clé %08lX: pas de clé publique pour la clé de confiance - 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"
@@ -3345,7 +3417,7 @@
 "ATTENTION: les enregistrements de préférences longs ne sont pas encore\n"
 "supportés\n"
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -3355,7 +3427,7 @@
 "Rappelez-vous bien que le fichier de signature (.sig ou .asc)\n"
 "doit être le premier fichier indiqué sur la ligne de commande.\n"
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
@@ -3367,42 +3439,51 @@
 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:1374
+#: g10/ringedit.c:319 g10/ringedit.c:1376
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porte-clés créé\n"
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1557
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 "ATTENTION: 2 fichiers avec des informations confidentielles existent.\n"
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1558
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s est le fichier original\n"
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1559
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s est le nouveau\n"
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1560
 msgid "Please fix this possible security flaw\n"
 msgstr "Réparez ce problème de sécurité possible\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "la clé n'est pas marquée comme non-sûre; on ne peut pas l'utiliser avec le\n"
 "pseudo-générateur de nombres aléatiores !\n"
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "`%s' a été ignoré: dupliqué\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' a été ignoré: %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+msgid "skipped: secret key already present\n"
+msgstr "ignoré: clé secrète déjà présente\n"
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3430,31 +3511,31 @@
 msgid "Enter new filename"
 msgstr "Entrez le nouveau nom de fichier"
 
-#: g10/openfile.c:182
+#: g10/openfile.c:184
 msgid "writing to stdout\n"
 msgstr "écriture vers la sortie standard\n"
 
-#: g10/openfile.c:261
+#: g10/openfile.c:273
 #, 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:311
+#: g10/openfile.c:323
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: nouveau fichier d'options créé\n"
 
-#: g10/openfile.c:338
+#: g10/openfile.c:350
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: impossible de créer le répertoire: %s\n"
 
-#: g10/openfile.c:341
+#: g10/openfile.c:353
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: répertoire créé\n"
 
-#: g10/openfile.c:343
+#: g10/openfile.c:355
 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"
@@ -3477,6 +3558,10 @@
 "ATTENTION: Le message a été chiffré avec une clé faible pendant le\n"
 "chiffrement symétrique.\n"
 
+#: g10/encr-data.c:97
+msgid "problem handling encrypted packet\n"
+msgstr "problème de gestion des paquets chiffrés\n"
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "clé faible générée - nouvel essai\n"
@@ -3488,14 +3573,6 @@
 "impossible d'éviter une clé faible pour le chiffrement symétrique:\n"
 "%d essais ont eu lieu !\n"
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "il y a une clé secrète pour cette clé publique !\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr "utiliser l'option «--delete-secret-key» pour l'effacer d'abord.\n"
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "impossible de faire cela en mode automatique sans «--yes»\n"
@@ -3508,6 +3585,14 @@
 msgid "This is a secret key! - really delete? "
 msgstr "C'est une clé secrète - faut-il vraiment l'effacer ? "
 
+#: g10/delkey.c:181
+msgid "there is a secret key for this public key!\n"
+msgstr "il y a une clé secrète pour cette clé publique !\n"
+
+#: g10/delkey.c:183
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr "utiliser l'option «--delete-secret-key» pour l'effacer d'abord.\n"
+
 #: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
@@ -3770,10 +3855,3 @@
 #, 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.4/po/gnupg.pot gnupg-1.0.5/po/gnupg.pot
--- gnupg-1.0.4/po/gnupg.pot	Mon Oct 16 19:22:11 2000
+++ gnupg-1.0.5/po/gnupg.pot	Sun Apr 29 16:39:21 2001
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-10-16 19:22+0200\n"
+"POT-Creation-Date: 2001-04-29 16:39+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,35 +18,35 @@
 msgid "Warning: using insecure memory!\n"
 msgstr ""
 
-#: util/secmem.c:295
+#: util/secmem.c:299
 msgid "operation is not possible without initialized secure memory\n"
 msgstr ""
 
-#: util/secmem.c:296
+#: util/secmem.c:300
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:287 util/miscutil.c:316
 msgid "yes"
 msgstr ""
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:288 util/miscutil.c:319
 msgid "yY"
 msgstr ""
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:289 util/miscutil.c:317
 msgid "no"
 msgstr ""
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:290 util/miscutil.c:320
 msgid "nN"
 msgstr ""
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:318
 msgid "quit"
 msgstr ""
 
-#: util/miscutil.c:311
+#: util/miscutil.c:321
 msgid "qQ"
 msgstr ""
 
@@ -246,6 +246,15 @@
 msgid "not processed"
 msgstr ""
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+msgid "unusable public key"
+msgstr ""
+
+#: util/errors.c:106
+msgid "unusable secret key"
+msgstr ""
+
 #: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -256,63 +265,63 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr ""
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr ""
 
-#: cipher/random.c:315
+#: cipher/random.c:324
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr ""
 
-#: cipher/random.c:320
+#: cipher/random.c:329
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:325
+#: cipher/random.c:334
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:331
+#: cipher/random.c:340
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:339
+#: cipher/random.c:348
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr ""
 
-#: cipher/random.c:377
+#: cipher/random.c:386
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:397
+#: cipher/random.c:406
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr ""
 
-#: cipher/random.c:404
+#: cipher/random.c:413
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr ""
 
-#: cipher/random.c:407
+#: cipher/random.c:416
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr ""
 
-#: cipher/random.c:418
+#: cipher/random.c:427
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:650
+#: cipher/random.c:661
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 
-#: cipher/random.c:651
+#: cipher/random.c:662
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -329,303 +338,307 @@
 "the OS a chance to collect more entropy! (Need %d more bytes)\n"
 msgstr ""
 
-#: g10/g10.c:206
+#: g10/g10.c:216
 msgid ""
 "@Commands:\n"
 " "
 msgstr ""
 
-#: g10/g10.c:208
+#: g10/g10.c:218
 msgid "|[file]|make a signature"
 msgstr ""
 
-#: g10/g10.c:209
+#: g10/g10.c:219
 msgid "|[file]|make a clear text signature"
 msgstr ""
 
-#: g10/g10.c:210
+#: g10/g10.c:220
 msgid "make a detached signature"
 msgstr ""
 
-#: g10/g10.c:211
+#: g10/g10.c:221
 msgid "encrypt data"
 msgstr ""
 
-#: g10/g10.c:212
+#: g10/g10.c:222
 msgid "encryption only with symmetric cipher"
 msgstr ""
 
-#: g10/g10.c:213
+#: g10/g10.c:223
 msgid "store only"
 msgstr ""
 
-#: g10/g10.c:214
+#: g10/g10.c:224
 msgid "decrypt data (default)"
 msgstr ""
 
-#: g10/g10.c:215
+#: g10/g10.c:225
 msgid "verify a signature"
 msgstr ""
 
-#: g10/g10.c:217
+#: g10/g10.c:227
 msgid "list keys"
 msgstr ""
 
-#: g10/g10.c:219
+#: g10/g10.c:229
 msgid "list keys and signatures"
 msgstr ""
 
-#: g10/g10.c:220
+#: g10/g10.c:230
 msgid "check key signatures"
 msgstr ""
 
-#: g10/g10.c:221
+#: g10/g10.c:231
 msgid "list keys and fingerprints"
 msgstr ""
 
-#: g10/g10.c:222
+#: g10/g10.c:232
 msgid "list secret keys"
 msgstr ""
 
-#: g10/g10.c:223
+#: g10/g10.c:233
 msgid "generate a new key pair"
 msgstr ""
 
-#: g10/g10.c:224
+#: g10/g10.c:234
 msgid "remove key from the public keyring"
 msgstr ""
 
-#: g10/g10.c:226
+#: g10/g10.c:236
 msgid "remove key from the secret keyring"
 msgstr ""
 
-#: g10/g10.c:227
+#: g10/g10.c:237
 msgid "sign a key"
 msgstr ""
 
-#: g10/g10.c:228
+#: g10/g10.c:238
 msgid "sign a key locally"
 msgstr ""
 
-#: g10/g10.c:229
+#: g10/g10.c:239
 msgid "sign or edit a key"
 msgstr ""
 
-#: g10/g10.c:230
+#: g10/g10.c:240
 msgid "generate a revocation certificate"
 msgstr ""
 
-#: g10/g10.c:231
+#: g10/g10.c:241
 msgid "export keys"
 msgstr ""
 
-#: g10/g10.c:232
+#: g10/g10.c:242
 msgid "export keys to a key server"
 msgstr ""
 
-#: g10/g10.c:233
+#: g10/g10.c:243
 msgid "import keys from a key server"
 msgstr ""
 
-#: g10/g10.c:237
+#: g10/g10.c:247
 msgid "import/merge keys"
 msgstr ""
 
-#: g10/g10.c:239
+#: g10/g10.c:249
 msgid "list only the sequence of packets"
 msgstr ""
 
-#: g10/g10.c:241
+#: g10/g10.c:251
 msgid "export the ownertrust values"
 msgstr ""
 
-#: g10/g10.c:243
+#: g10/g10.c:253
 msgid "import ownertrust values"
 msgstr ""
 
-#: g10/g10.c:245
+#: g10/g10.c:255
 msgid "update the trust database"
 msgstr ""
 
-#: g10/g10.c:247
+#: g10/g10.c:257
 msgid "|[NAMES]|check the trust database"
 msgstr ""
 
-#: g10/g10.c:248
+#: g10/g10.c:258
 msgid "fix a corrupted trust database"
 msgstr ""
 
-#: g10/g10.c:249
+#: g10/g10.c:259
 msgid "De-Armor a file or stdin"
 msgstr ""
 
-#: g10/g10.c:251
+#: g10/g10.c:261
 msgid "En-Armor a file or stdin"
 msgstr ""
 
-#: g10/g10.c:253
+#: g10/g10.c:263
 msgid "|algo [files]|print message digests"
 msgstr ""
 
-#: g10/g10.c:257
+#: g10/g10.c:267
 msgid ""
 "@\n"
 "Options:\n"
 " "
 msgstr ""
 
-#: g10/g10.c:259
+#: g10/g10.c:269
 msgid "create ascii armored output"
 msgstr ""
 
-#: g10/g10.c:261
+#: g10/g10.c:271
 msgid "|NAME|encrypt for NAME"
 msgstr ""
 
-#: g10/g10.c:264
+#: g10/g10.c:274
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: g10/g10.c:266
+#: g10/g10.c:276
 msgid "use the default key as default recipient"
 msgstr ""
 
-#: g10/g10.c:270
+#: g10/g10.c:280
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 
-#: g10/g10.c:271
+#: g10/g10.c:281
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 
-#: g10/g10.c:273
+#: g10/g10.c:283
 msgid "use canonical text mode"
 msgstr ""
 
-#: g10/g10.c:274
+#: g10/g10.c:284
 msgid "use as output file"
 msgstr ""
 
-#: g10/g10.c:275
+#: g10/g10.c:285
 msgid "verbose"
 msgstr ""
 
-#: g10/g10.c:276
+#: g10/g10.c:286
 msgid "be somewhat more quiet"
 msgstr ""
 
-#: g10/g10.c:277
+#: g10/g10.c:287
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: g10/g10.c:278
+#: g10/g10.c:288
 msgid "force v3 signatures"
 msgstr ""
 
-#: g10/g10.c:279
+#: g10/g10.c:289
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: g10/g10.c:280
+#: g10/g10.c:290
 msgid "do not make any changes"
 msgstr ""
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:282
+#: g10/g10.c:292
+msgid "use the gpg-agent"
+msgstr ""
+
+#: g10/g10.c:293
 msgid "batch mode: never ask"
 msgstr ""
 
-#: g10/g10.c:283
+#: g10/g10.c:294
 msgid "assume yes on most questions"
 msgstr ""
 
-#: g10/g10.c:284
+#: g10/g10.c:295
 msgid "assume no on most questions"
 msgstr ""
 
-#: g10/g10.c:285
+#: g10/g10.c:296
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 
-#: g10/g10.c:286
+#: g10/g10.c:297
 msgid "add this secret keyring to the list"
 msgstr ""
 
-#: g10/g10.c:287
+#: g10/g10.c:298
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: g10/g10.c:288
+#: g10/g10.c:299
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: g10/g10.c:289
+#: g10/g10.c:300
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 
-#: g10/g10.c:290
+#: g10/g10.c:301
 msgid "read options from file"
 msgstr ""
 
-#: g10/g10.c:294
+#: g10/g10.c:305
 msgid "|FD|write status info to this FD"
 msgstr ""
 
-#: g10/g10.c:299
+#: g10/g10.c:310
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:300
+#: g10/g10.c:311
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: g10/g10.c:301
+#: g10/g10.c:312
 msgid "emulate the mode described in RFC1991"
 msgstr ""
 
-#: g10/g10.c:302
+#: g10/g10.c:313
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:303
+#: g10/g10.c:314
 msgid "|N|use passphrase mode N"
 msgstr ""
 
-#: g10/g10.c:305
+#: g10/g10.c:316
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 
-#: g10/g10.c:307
+#: g10/g10.c:318
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 
-#: g10/g10.c:308
+#: g10/g10.c:319
 msgid "|NAME|use cipher algorithm NAME"
 msgstr ""
 
-#: g10/g10.c:309
+#: g10/g10.c:320
 msgid "|NAME|use message digest algorithm NAME"
 msgstr ""
 
-#: g10/g10.c:310
+#: g10/g10.c:321
 msgid "|N|use compress algorithm N"
 msgstr ""
 
-#: g10/g10.c:311
+#: g10/g10.c:322
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 
-#: g10/g10.c:312
+#: g10/g10.c:323
 msgid "|NAME=VALUE|use this notation data"
 msgstr ""
 
-#: g10/g10.c:315
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:318
+#: g10/g10.c:329
 msgid ""
 "@\n"
 "Examples:\n"
@@ -637,300 +650,304 @@
 " --fingerprint [names]      show fingerprints\n"
 msgstr ""
 
-#: g10/g10.c:418
+#: g10/g10.c:438
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 
-#: g10/g10.c:422
+#: g10/g10.c:442
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr ""
 
-#: g10/g10.c:425
+#: g10/g10.c:445
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
 "default operation depends on the input data\n"
 msgstr ""
 
-#: g10/g10.c:432
+#: g10/g10.c:452
 msgid ""
 "\n"
 "Supported algorithms:\n"
 msgstr ""
 
-#: g10/g10.c:511
+#: g10/g10.c:531
 msgid "usage: gpg [options] "
 msgstr ""
 
-#: g10/g10.c:564
+#: g10/g10.c:584
 msgid "conflicting commands\n"
 msgstr ""
 
-#: g10/g10.c:704
+#: g10/g10.c:734
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:708
+#: g10/g10.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: g10/g10.c:715
+#: g10/g10.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
 
-#: g10/g10.c:905
+#: g10/g10.c:950
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr ""
 
-#: g10/g10.c:970
+#: g10/g10.c:1024
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:974 g10/g10.c:983
+#: g10/g10.c:1028 g10/g10.c:1037
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/g10.c:976
+#: g10/g10.c:1030
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr ""
 
-#: g10/g10.c:979
+#: g10/g10.c:1033
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr ""
 
-#: g10/g10.c:998 g10/g10.c:1010
+#: g10/g10.c:1053 g10/g10.c:1065
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:1004 g10/g10.c:1016
+#: g10/g10.c:1059 g10/g10.c:1071
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:1020
+#: g10/g10.c:1075
 msgid "the given policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:1023
+#: g10/g10.c:1078
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr ""
 
-#: g10/g10.c:1025
+#: g10/g10.c:1080
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:1027
+#: g10/g10.c:1082
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:1029
+#: g10/g10.c:1084
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:1032
+#: g10/g10.c:1087
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/g10.c:1036
+#: g10/g10.c:1091
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/g10.c:1121
+#: g10/g10.c:1176
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/g10.c:1127
+#: g10/g10.c:1182
 msgid "--store [filename]"
 msgstr ""
 
-#: g10/g10.c:1134
+#: g10/g10.c:1189
 msgid "--symmetric [filename]"
 msgstr ""
 
-#: g10/g10.c:1142
+#: g10/g10.c:1197
 msgid "--encrypt [filename]"
 msgstr ""
 
-#: g10/g10.c:1155
+#: g10/g10.c:1210
 msgid "--sign [filename]"
 msgstr ""
 
-#: g10/g10.c:1168
+#: g10/g10.c:1223
 msgid "--sign --encrypt [filename]"
 msgstr ""
 
-#: g10/g10.c:1182
+#: g10/g10.c:1237
 msgid "--clearsign [filename]"
 msgstr ""
 
-#: g10/g10.c:1199
+#: g10/g10.c:1254
 msgid "--decrypt [filename]"
 msgstr ""
 
-#: g10/g10.c:1207
+#: g10/g10.c:1262
 msgid "--sign-key user-id"
 msgstr ""
 
-#: g10/g10.c:1215
+#: g10/g10.c:1270
 msgid "--lsign-key user-id"
 msgstr ""
 
-#: g10/g10.c:1223
+#: g10/g10.c:1278
 msgid "--edit-key user-id [commands]"
 msgstr ""
 
-#: g10/g10.c:1239
+#: g10/g10.c:1294
 msgid "--delete-secret-key user-id"
 msgstr ""
 
-#: g10/g10.c:1242
+#: g10/g10.c:1297
 msgid "--delete-key user-id"
 msgstr ""
 
-#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
+#: g10/g10.c:1305
+msgid "--delete-secret-and-public-key user-id"
+msgstr ""
+
+#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr ""
 
-#: g10/g10.c:1294
+#: g10/g10.c:1357
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr ""
 
-#: g10/g10.c:1360
+#: g10/g10.c:1423
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:1368
+#: g10/g10.c:1431
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:1439
+#: g10/g10.c:1502
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1520
+#: g10/g10.c:1589
 msgid "[filename]"
 msgstr ""
 
-#: g10/g10.c:1524
+#: g10/g10.c:1593
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1737
+#: g10/g10.c:1805
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/g10.c:1743
+#: g10/g10.c:1811
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1749
+#: g10/g10.c:1817
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1757
+#: g10/g10.c:1825
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
-#: g10/armor.c:302
+#: g10/armor.c:306
 #, c-format
 msgid "armor: %s\n"
 msgstr ""
 
-#: g10/armor.c:331
+#: g10/armor.c:335
 msgid "invalid armor header: "
 msgstr ""
 
-#: g10/armor.c:338
+#: g10/armor.c:342
 msgid "armor header: "
 msgstr ""
 
-#: g10/armor.c:349
+#: g10/armor.c:353
 msgid "invalid clearsig header\n"
 msgstr ""
 
-#: g10/armor.c:401
+#: g10/armor.c:405
 msgid "nested clear text signatures\n"
 msgstr ""
 
-#: g10/armor.c:525
+#: g10/armor.c:529
 msgid "invalid dash escaped line: "
 msgstr ""
 
-#: g10/armor.c:537
+#: g10/armor.c:541
 msgid "unexpected armor:"
 msgstr ""
 
-#: g10/armor.c:654
+#: g10/armor.c:667 g10/armor.c:1235
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr ""
 
-#: g10/armor.c:697
+#: g10/armor.c:710
 msgid "premature eof (no CRC)\n"
 msgstr ""
 
-#: g10/armor.c:731
+#: g10/armor.c:744
 msgid "premature eof (in CRC)\n"
 msgstr ""
 
-#: g10/armor.c:735
+#: g10/armor.c:748
 msgid "malformed CRC\n"
 msgstr ""
 
-#: g10/armor.c:739
+#: g10/armor.c:752 g10/armor.c:1272
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr ""
 
-#: g10/armor.c:756
+#: g10/armor.c:772
 msgid "premature eof (in Trailer)\n"
 msgstr ""
 
-#: g10/armor.c:760
+#: g10/armor.c:776
 msgid "error in trailer line\n"
 msgstr ""
 
-#: g10/armor.c:906
+#: g10/armor.c:922
 msgid "For info see http://www.gnupg.org"
 msgstr ""
 
-#: g10/armor.c:1027
+#: g10/armor.c:1050
 msgid "no valid OpenPGP data found.\n"
 msgstr ""
 
-#: g10/armor.c:1032
+#: g10/armor.c:1055
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr ""
 
-#: g10/armor.c:1036
+#: g10/armor.c:1059
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr ""
 
@@ -1130,58 +1147,58 @@
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr ""
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr ""
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr ""
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr ""
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
 msgstr ""
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr ""
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr ""
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr ""
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr ""
 
@@ -1189,62 +1206,66 @@
 msgid "writing self signature\n"
 msgstr ""
 
-#: g10/keygen.c:214
+#: g10/keygen.c:217
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
+#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
+#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:540
+#: g10/keygen.c:549
 msgid "Please select what kind of key you want:\n"
 msgstr ""
 
-#: g10/keygen.c:542
+#: g10/keygen.c:551
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr ""
 
-#: g10/keygen.c:543
+#: g10/keygen.c:552
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:545
+#: g10/keygen.c:554
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr ""
 
-#: g10/keygen.c:546
+#: g10/keygen.c:555
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr ""
 
-#: g10/keygen.c:548
+#: g10/keygen.c:557
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr ""
 
-#: g10/keygen.c:552
+#: g10/keygen.c:561
 msgid "Your selection? "
 msgstr ""
 
-#: g10/keygen.c:563 g10/keygen.c:571
+#: g10/keygen.c:572
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr ""
 
-#: g10/keygen.c:585
+#: g10/keygen.c:580
+msgid "The use of this algorithm is deprecated - create anyway? "
+msgstr ""
+
+#: g10/keygen.c:594
 msgid "Invalid selection.\n"
 msgstr ""
 
-#: g10/keygen.c:597
+#: g10/keygen.c:606
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1253,19 +1274,19 @@
 "    highest suggested keysize is 2048 bits\n"
 msgstr ""
 
-#: g10/keygen.c:604
+#: g10/keygen.c:613
 msgid "What keysize do you want? (1024) "
 msgstr ""
 
-#: g10/keygen.c:609
+#: g10/keygen.c:618
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr ""
 
-#: g10/keygen.c:611
+#: g10/keygen.c:620
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr ""
 
-#: g10/keygen.c:613
+#: g10/keygen.c:622
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 
@@ -1277,42 +1298,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:624
+#: g10/keygen.c:633
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr ""
 
-#: g10/keygen.c:629
+#: g10/keygen.c:638
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
 msgstr ""
 
-#: g10/keygen.c:632
+#: g10/keygen.c:641
 msgid "Are you sure that you want this keysize? "
 msgstr ""
 
-#: g10/keygen.c:633
+#: g10/keygen.c:642
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
 msgstr ""
 
-#: g10/keygen.c:641
+#: g10/keygen.c:650
 msgid "Do you really need such a large keysize? "
 msgstr ""
 
-#: g10/keygen.c:647
+#: g10/keygen.c:656
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:650 g10/keygen.c:654
+#: g10/keygen.c:659 g10/keygen.c:663
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:702
+#: g10/keygen.c:711
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1322,35 +1343,35 @@
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:717
+#: g10/keygen.c:726
 msgid "Key is valid for? (0) "
 msgstr ""
 
-#: g10/keygen.c:722
+#: g10/keygen.c:731
 msgid "invalid value\n"
 msgstr ""
 
-#: g10/keygen.c:727
+#: g10/keygen.c:736
 msgid "Key does not expire at all\n"
 msgstr ""
 
 #. print the date when the key expires
-#: g10/keygen.c:733
+#: g10/keygen.c:742
 #, c-format
 msgid "Key expires at %s\n"
 msgstr ""
 
-#: g10/keygen.c:736
+#: g10/keygen.c:745
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:741
+#: g10/keygen.c:750
 msgid "Is this correct (y/n)? "
 msgstr ""
 
-#: g10/keygen.c:784
+#: g10/keygen.c:793
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1360,44 +1381,44 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:796
+#: g10/keygen.c:805
 msgid "Real name: "
 msgstr ""
 
-#: g10/keygen.c:804
+#: g10/keygen.c:813
 msgid "Invalid character in name\n"
 msgstr ""
 
-#: g10/keygen.c:806
+#: g10/keygen.c:815
 msgid "Name may not start with a digit\n"
 msgstr ""
 
-#: g10/keygen.c:808
+#: g10/keygen.c:817
 msgid "Name must be at least 5 characters long\n"
 msgstr ""
 
-#: g10/keygen.c:816
+#: g10/keygen.c:825
 msgid "Email address: "
 msgstr ""
 
-#: g10/keygen.c:827
+#: g10/keygen.c:836
 msgid "Not a valid email address\n"
 msgstr ""
 
-#: g10/keygen.c:835
+#: g10/keygen.c:844
 msgid "Comment: "
 msgstr ""
 
-#: g10/keygen.c:841
+#: g10/keygen.c:850
 msgid "Invalid character in comment\n"
 msgstr ""
 
-#: g10/keygen.c:864
+#: g10/keygen.c:873
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:870
+#: g10/keygen.c:879
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1405,37 +1426,37 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:874
+#: g10/keygen.c:883
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:879
+#: g10/keygen.c:888
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:889
+#: g10/keygen.c:898
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:890
+#: g10/keygen.c:899
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:909
+#: g10/keygen.c:918
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:947
+#: g10/keygen.c:956
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:964
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr ""
 
-#: g10/keygen.c:961
+#: g10/keygen.c:970
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1443,7 +1464,7 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:982
+#: g10/keygen.c:991
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1451,56 +1472,56 @@
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:1431
+#: g10/keygen.c:1440
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr ""
 
-#: g10/keygen.c:1474
+#: g10/keygen.c:1483
 msgid "Key generation canceled.\n"
 msgstr ""
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1581
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1582
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1679
 msgid "public and secret key created and signed.\n"
 msgstr ""
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1684
 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:1690 g10/keygen.c:1791
+#: g10/keygen.c:1701 g10/keygen.c:1807
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1748 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:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1750 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:1769
+#: g10/keygen.c:1783
 msgid "Really create? "
 msgstr ""
 
-#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1511,17 +1532,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr ""
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr ""
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr ""
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr ""
@@ -1546,279 +1567,279 @@
 msgid "key %08lX: not protected - skipped\n"
 msgstr ""
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr ""
 
-#: g10/getkey.c:211
+#: g10/getkey.c:214
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:350
-msgid "too many entries in unk cache - disabled\n"
-msgstr ""
-
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr ""
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+msgid "[User id not found]"
 msgstr ""
 
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
+#: g10/getkey.c:453
+msgid "too many entries in unk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2207
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr ""
 
-#: g10/getkey.c:2050
-msgid "[User id not found]"
+#: g10/getkey.c:2249 g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
 
-#: g10/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr ""
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr ""
 
-#: g10/import.c:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr ""
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr ""
 
-#: g10/import.c:206
+#: g10/import.c:208
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr ""
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr ""
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr ""
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr ""
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr ""
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr ""
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr ""
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr ""
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr ""
 
-#: g10/import.c:407
+#: g10/import.c:424
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:418 g10/import.c:657
+#: g10/import.c:435 g10/import.c:684
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr ""
 
-#: g10/import.c:423
+#: g10/import.c:440
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr ""
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr ""
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
 #, c-format
 msgid "writing to `%s'\n"
 msgstr ""
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr ""
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr ""
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr ""
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr ""
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:489 g10/import.c:692
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr ""
 
-#: g10/import.c:478 g10/import.c:671
+#: g10/import.c:495 g10/import.c:698
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr ""
 
-#: g10/import.c:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr ""
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr ""
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr ""
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr ""
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr ""
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr ""
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr ""
 
-#: g10/import.c:613
+#: g10/import.c:610
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:640
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr ""
 
 #. we can't merge secret keys
-#: g10/import.c:617
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr ""
 
-#: g10/import.c:622
+#: g10/import.c:649
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr ""
 
-#: g10/import.c:651
+#: g10/import.c:678
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 
-#: g10/import.c:682
+#: g10/import.c:709
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 
-#: g10/import.c:714
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr ""
 
-#: g10/import.c:756
+#: g10/import.c:783
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr ""
 
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:790 g10/import.c:814
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr ""
 
-#: g10/import.c:764
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr ""
 
-#: g10/import.c:779
+#: g10/import.c:806
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr ""
 
-#: g10/import.c:788
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr ""
 
-#: g10/import.c:815
+#: g10/import.c:842
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr ""
 
-#: g10/import.c:844
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr ""
 
-#: g10/import.c:867
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr ""
@@ -1827,729 +1848,730 @@
 #. * 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:892
+#: g10/import.c:919
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr ""
 
-#: g10/import.c:901
+#: g10/import.c:928
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:909
+#: g10/import.c:936
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 
-#: g10/import.c:1009
+#: g10/import.c:1036
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1060
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr ""
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr ""
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr ""
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr ""
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
 msgstr ""
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr ""
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
 msgstr ""
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr ""
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
 msgstr ""
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr ""
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
 msgstr ""
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr ""
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr ""
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr ""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr ""
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
 #, c-format
 msgid "signing failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr ""
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:432
 msgid "Secret parts of primary key are not available.\n"
 msgstr ""
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr ""
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr ""
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr ""
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr ""
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr ""
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr ""
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr ""
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr ""
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr ""
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr ""
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr ""
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
 msgstr ""
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr ""
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr ""
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr ""
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr ""
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr ""
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr ""
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr ""
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr ""
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr ""
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr ""
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr ""
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
 msgstr ""
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr ""
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr ""
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
 msgstr ""
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr ""
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
 msgstr ""
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr ""
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
 msgstr ""
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr ""
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr ""
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr ""
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr ""
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr ""
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr ""
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606 g10/keyedit.c:607
 msgid "list preferences"
 msgstr ""
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
+msgid "showpref"
+msgstr ""
+
+#: g10/keyedit.c:608
 msgid "passwd"
 msgstr ""
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:608
 msgid "change the passphrase"
 msgstr ""
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "trust"
 msgstr ""
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revsig"
 msgstr ""
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revoke signatures"
 msgstr ""
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revkey"
 msgstr ""
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revoke a secondary key"
 msgstr ""
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable"
 msgstr ""
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable a key"
 msgstr ""
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable"
 msgstr ""
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable a key"
 msgstr ""
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:633
 msgid "can't do that in batchmode\n"
 msgstr ""
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:669
+#: g10/keyedit.c:671
 msgid "Secret key is available.\n"
 msgstr ""
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:700
 msgid "Command> "
 msgstr ""
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:781
 msgid "Really sign all user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:782
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:814 g10/keyedit.c:1000
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:825 g10/keyedit.c:846
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:827
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:830
 msgid "Really remove all selected user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:831
 msgid "Really remove this user ID? "
 msgstr ""
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:867 g10/keyedit.c:889
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:871
 msgid "Do you really want to delete the selected keys? "
 msgstr ""
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:872
 msgid "Do you really want to delete this key? "
 msgstr ""
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke the selected keys? "
 msgstr ""
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:894
 msgid "Do you really want to revoke this key? "
 msgstr ""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
 msgid "Save changes? "
 msgstr ""
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:967
 msgid "Quit without saving? "
 msgstr ""
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:978
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:985
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:992
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1007
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1090
+#: g10/keyedit.c:1140
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1144
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1173
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1176
 msgid "rev- faked revocation found\n"
 msgstr ""
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1178
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1420
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1424
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1428
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1434
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1448
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1449
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1452
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1521
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1527
 msgid "Please select at most one secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1531
 msgid "Changing expiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1533
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1575
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1591
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1652
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1698
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1796
 msgid "user ID: \""
 msgstr ""
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1799
 #, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1803
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr ""
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1827
 msgid "You have signed these user IDs:\n"
 msgstr ""
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1846
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1866
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1884
 msgid "Really create the revocation certificates? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1913
 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:400 g10/mainproc.c:790
+#: g10/keylist.c:279 g10/mainproc.c:851
 #, c-format
 msgid " [expires: %s]"
 msgstr ""
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:269
 #, c-format
 msgid "public key is %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:314
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:366
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr ""
 
-#: g10/mainproc.c:336
+#: g10/mainproc.c:376
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr ""
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:390
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:430
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:435
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:440
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:459
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:461
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:632
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:719 g10/mainproc.c:728
 msgid "WARNING: invalid notation data found\n"
 msgstr ""
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:731
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:680
+#: g10/mainproc.c:740
 msgid "Policy: "
 msgstr ""
 
-#: g10/mainproc.c:1121
+#: g10/mainproc.c:1193
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1158
+#. plaintext before signatures but no one-pass packets
+#: g10/mainproc.c:1235 g10/mainproc.c:1245
+msgid "can't handle these multiple signatures\n"
+msgstr ""
+
+#: g10/mainproc.c:1256
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1184 g10/mainproc.c:1195
+#: g10/mainproc.c:1284 g10/mainproc.c:1292
 msgid "BAD signature from \""
 msgstr ""
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1196
+#: g10/mainproc.c:1285 g10/mainproc.c:1293
 msgid "Good signature from \""
 msgstr ""
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr ""
 
-#: g10/mainproc.c:1243
+#: g10/mainproc.c:1358
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1318
+#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+msgid "not a detached signature\n"
+msgstr ""
+
+#: g10/mainproc.c:1454
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1511
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1518
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr ""
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr ""
 
-#: g10/misc.c:234
-msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
+#: g10/misc.c:238
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
 
 #: g10/parse-packet.c:119
@@ -2557,37 +2579,83 @@
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:991
+#: g10/parse-packet.c:1010
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:159
+#: g10/passphrase.c:223
+msgid "gpg-agent is not available in this session\n"
+msgstr ""
+
+#: g10/passphrase.c:229
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr ""
+
+#: g10/hkp.c:167 g10/passphrase.c:248
+#, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr ""
+
+#: g10/passphrase.c:313 g10/passphrase.c:576
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr ""
+
+#: g10/passphrase.c:323
+#, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+
+#: g10/passphrase.c:344
+msgid "Enter passphrase\n"
+msgstr ""
+
+#: g10/passphrase.c:346
+msgid "Repeat passphrase\n"
+msgstr ""
+
+#: g10/passphrase.c:384
+msgid "passphrase too long\n"
+msgstr ""
+
+#: g10/passphrase.c:396
+msgid "invalid response from agent\n"
+msgstr ""
+
+#: g10/passphrase.c:405
+msgid "cancelled by user\n"
+msgstr ""
+
+#: g10/passphrase.c:408 g10/passphrase.c:477
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr ""
+
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
 "user: \""
 msgstr ""
 
-#: g10/passphrase.c:168
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr ""
 
-#: g10/passphrase.c:173
-#, c-format
-msgid " (main key ID %08lX)"
-msgstr ""
-
-#: g10/passphrase.c:190
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
 msgstr ""
 
-#: g10/passphrase.c:194
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr ""
 
-#: g10/passphrase.c:198
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr ""
 
@@ -2595,19 +2663,23 @@
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:324
+#: g10/plaintext.c:332
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:328
+#: g10/plaintext.c:336
 msgid "Please enter name of data file: "
 msgstr ""
 
-#: g10/plaintext.c:349
+#: g10/plaintext.c:357
 msgid "reading stdin ...\n"
 msgstr ""
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:391
+msgid "no signed data\n"
+msgstr ""
+
+#: g10/plaintext.c:399
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
@@ -2640,41 +2712,36 @@
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr ""
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr ""
 
-#: g10/hkp.c:85
+#: g10/hkp.c:83
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr ""
 
-#: g10/hkp.c:109 g10/hkp.c:148
+#: g10/hkp.c:102 g10/hkp.c:136
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/hkp.c:117
+#: g10/hkp.c:110
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr ""
 
-#: g10/hkp.c:170
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr ""
-
-#: g10/hkp.c:194
+#: g10/hkp.c:191
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr ""
 
-#: g10/hkp.c:206
+#: g10/hkp.c:203
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:209
+#: g10/hkp.c:206
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
@@ -2715,30 +2782,35 @@
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:324
+#: g10/sig-check.c:328
 #, c-format
-msgid "NOTE: signature key expired %s\n"
+msgid "NOTE: signature key %08lX expired %s\n"
 msgstr ""
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sign.c:140
+#: g10/sign.c:152
+#, c-format
+msgid "checking created signature failed: %s\n"
+msgstr ""
+
+#: g10/sign.c:161
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr ""
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:307 g10/sign.c:630
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr ""
 
-#: g10/sign.c:388
+#: g10/sign.c:405
 msgid "signing:"
 msgstr ""
 
-#: g10/sign.c:431
+#: g10/sign.c:448
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr ""
@@ -2777,7 +2849,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
+#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr ""
@@ -2957,11 +3029,6 @@
 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"
@@ -3169,14 +3236,14 @@
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr ""
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
@@ -3186,39 +3253,48 @@
 msgid "%s: can't create keyring: %s\n"
 msgstr ""
 
-#: g10/ringedit.c:319 g10/ringedit.c:1374
+#: g10/ringedit.c:319 g10/ringedit.c:1376
 #, c-format
 msgid "%s: keyring created\n"
 msgstr ""
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1557
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1558
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1559
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1560
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr ""
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr ""
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+msgid "skipped: secret key already present\n"
+msgstr ""
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3244,31 +3320,31 @@
 msgid "Enter new filename"
 msgstr ""
 
-#: g10/openfile.c:182
+#: g10/openfile.c:184
 msgid "writing to stdout\n"
 msgstr ""
 
-#: g10/openfile.c:261
+#: g10/openfile.c:273
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr ""
 
-#: g10/openfile.c:311
+#: g10/openfile.c:323
 #, c-format
 msgid "%s: new options file created\n"
 msgstr ""
 
-#: g10/openfile.c:338
+#: g10/openfile.c:350
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr ""
 
-#: g10/openfile.c:341
+#: g10/openfile.c:353
 #, c-format
 msgid "%s: directory created\n"
 msgstr ""
 
-#: g10/openfile.c:343
+#: g10/openfile.c:355
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 
@@ -3287,6 +3363,10 @@
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 
+#: g10/encr-data.c:97
+msgid "problem handling encrypted packet\n"
+msgstr ""
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr ""
@@ -3296,14 +3376,6 @@
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr ""
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr ""
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr ""
@@ -3314,6 +3386,14 @@
 
 #: g10/delkey.c:144
 msgid "This is a secret key! - really delete? "
+msgstr ""
+
+#: g10/delkey.c:181
+msgid "there is a secret key for this public key!\n"
+msgstr ""
+
+#: g10/delkey.c:183
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr ""
 
 #: g10/helptext.c:47
diff -urN gnupg-1.0.4/po/id.po gnupg-1.0.5/po/id.po
--- gnupg-1.0.4/po/id.po	Tue Oct 17 15:40:37 2000
+++ gnupg-1.0.5/po/id.po	Sun Apr 29 16:39:26 2001
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU Privacy Guard 1.0.1\n"
-"POT-Creation-Date: 2000-10-16 19:22+0200\n"
+"POT-Creation-Date: 2001-04-29 16:39+0200\n"
 "PO-Revision-Date: 2000-02-06 18:04+07:00\n"
 "Last-Translator: Tedi Heriyanto <tedi-h@usa.net>\n"
 "Language-Team: Indonesia <id@li.org>\n"
@@ -17,35 +17,35 @@
 msgid "Warning: using insecure memory!\n"
 msgstr "Peringatan: menggunakan memori yang tidak aman!\n"
 
-#: util/secmem.c:295
+#: util/secmem.c:299
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operasi tidak mungkin tanpa menginisialisasi memori yang aman\n"
 
-#: util/secmem.c:296
+#: util/secmem.c:300
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:287 util/miscutil.c:316
 msgid "yes"
 msgstr "ya"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:288 util/miscutil.c:319
 msgid "yY"
 msgstr "yY"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:289 util/miscutil.c:317
 msgid "no"
 msgstr "tidak"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:290 util/miscutil.c:320
 msgid "nN"
 msgstr "tT"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:318
 msgid "quit"
 msgstr "keluar"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:321
 msgid "qQ"
 msgstr "kK"
 
@@ -246,6 +246,17 @@
 msgid "not processed"
 msgstr "%lu kunci diproses\n"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "kunci publik yang buruk"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "kunci rahasia yang buruk"
+
 #: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -256,63 +267,63 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "anda menemukan kesalahan ...(%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:324
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:329
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:325
+#: cipher/random.c:334
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:331
+#: cipher/random.c:340
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:339
+#: cipher/random.c:348
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:386
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:397
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:413
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:416
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:427
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:650
+#: cipher/random.c:661
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "PERINGATAN: menggunakan random number generator yang tidak aman!!\n"
 
-#: cipher/random.c:651
+#: cipher/random.c:662
 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 +348,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:206
+#: g10/g10.c:216
 msgid ""
 "@Commands:\n"
 " "
@@ -345,140 +356,140 @@
 "@Perintah:\n"
 "  "
 
-#: g10/g10.c:208
+#: g10/g10.c:218
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/g10.c:209
+#: g10/g10.c:219
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/g10.c:210
+#: g10/g10.c:220
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/g10.c:211
+#: g10/g10.c:221
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/g10.c:212
+#: g10/g10.c:222
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/g10.c:213
+#: g10/g10.c:223
 msgid "store only"
 msgstr "hanya disimpan"
 
-#: g10/g10.c:214
+#: g10/g10.c:224
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/g10.c:215
+#: g10/g10.c:225
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/g10.c:217
+#: g10/g10.c:227
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/g10.c:219
+#: g10/g10.c:229
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/g10.c:220
+#: g10/g10.c:230
 msgid "check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/g10.c:221
+#: g10/g10.c:231
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/g10.c:222
+#: g10/g10.c:232
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/g10.c:223
+#: g10/g10.c:233
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/g10.c:224
+#: g10/g10.c:234
 msgid "remove key from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/g10.c:226
+#: g10/g10.c:236
 #, fuzzy
 msgid "remove key from the secret keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/g10.c:227
+#: g10/g10.c:237
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/g10.c:228
+#: g10/g10.c:238
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/g10.c:229
+#: g10/g10.c:239
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/g10.c:230
+#: g10/g10.c:240
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/g10.c:231
+#: g10/g10.c:241
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/g10.c:232
+#: g10/g10.c:242
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/g10.c:233
+#: g10/g10.c:243
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/g10.c:237
+#: g10/g10.c:247
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/g10.c:239
+#: g10/g10.c:249
 msgid "list only the sequence of packets"
 msgstr "tampilkan hanya urutan paket"
 
-#: g10/g10.c:241
+#: g10/g10.c:251
 msgid "export the ownertrust values"
 msgstr "ekspor nilai ownertrust"
 
-#: g10/g10.c:243
+#: g10/g10.c:253
 msgid "import ownertrust values"
 msgstr "impor nilai ownertrust"
 
-#: g10/g10.c:245
+#: g10/g10.c:255
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/g10.c:247
+#: g10/g10.c:257
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMA]|periksa database trust"
 
-#: g10/g10.c:248
+#: g10/g10.c:258
 msgid "fix a corrupted trust database"
 msgstr "perbaiki database trust yang terkorupsi"
 
-#: g10/g10.c:249
+#: g10/g10.c:259
 msgid "De-Armor a file or stdin"
 msgstr "De-Armor file atau stdin"
 
-#: g10/g10.c:251
+#: g10/g10.c:261
 msgid "En-Armor a file or stdin"
 msgstr "En-Armor file atau stdin"
 
-#: g10/g10.c:253
+#: g10/g10.c:263
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/g10.c:257
+#: g10/g10.c:267
 msgid ""
 "@\n"
 "Options:\n"
@@ -488,158 +499,162 @@
 "Pilihan:\n"
 "  "
 
-#: g10/g10.c:259
+#: g10/g10.c:269
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/g10.c:261
+#: g10/g10.c:271
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/g10.c:264
+#: g10/g10.c:274
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: g10/g10.c:266
+#: g10/g10.c:276
 msgid "use the default key as default recipient"
 msgstr "gunakan kunci baku sebagai penerima baku"
 
-#: g10/g10.c:270
+#: g10/g10.c:280
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/g10.c:271
+#: g10/g10.c:281
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/g10.c:273
+#: g10/g10.c:283
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/g10.c:274
+#: g10/g10.c:284
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/g10.c:275
+#: g10/g10.c:285
 msgid "verbose"
 msgstr "detil"
 
-#: g10/g10.c:276
+#: g10/g10.c:286
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: g10/g10.c:277
+#: g10/g10.c:287
 msgid "don't use the terminal at all"
 msgstr "jangan menggunakan terminal"
 
-#: g10/g10.c:278
+#: g10/g10.c:288
 msgid "force v3 signatures"
 msgstr "paksa signature v3"
 
-#: g10/g10.c:279
+#: g10/g10.c:289
 msgid "always use a MDC for encryption"
 msgstr "selalu gunakan MDC untuk enkripsi"
 
-#: g10/g10.c:280
+#: g10/g10.c:290
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:282
+#: g10/g10.c:292
+msgid "use the gpg-agent"
+msgstr ""
+
+#: g10/g10.c:293
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: g10/g10.c:283
+#: g10/g10.c:294
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: g10/g10.c:284
+#: g10/g10.c:295
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: g10/g10.c:285
+#: g10/g10.c:296
 msgid "add this keyring to the list of keyrings"
 msgstr "tambah keyring ini ke daftar keyring"
 
-#: g10/g10.c:286
+#: g10/g10.c:297
 msgid "add this secret keyring to the list"
 msgstr "tambah keyring rahasia ini ke daftar"
 
-#: g10/g10.c:287
+#: g10/g10.c:298
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: g10/g10.c:288
+#: g10/g10.c:299
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
 
-#: g10/g10.c:289
+#: g10/g10.c:300
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMA|set charset terminal ke NAMA"
 
-#: g10/g10.c:290
+#: g10/g10.c:301
 msgid "read options from file"
 msgstr "baca pilihan dari file"
 
-#: g10/g10.c:294
+#: g10/g10.c:305
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
-#: g10/g10.c:299
+#: g10/g10.c:310
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:300
+#: g10/g10.c:311
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: g10/g10.c:301
+#: g10/g10.c:312
 msgid "emulate the mode described in RFC1991"
 msgstr "emulasikan mode seperti dalam RFC1991"
 
-#: g10/g10.c:302
+#: g10/g10.c:313
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "set pilihan paket, cipher, digest ke OpenPGP"
 
-#: g10/g10.c:303
+#: g10/g10.c:314
 msgid "|N|use passphrase mode N"
 msgstr "|N|gunakan passphrase mode N"
 
-#: g10/g10.c:305
+#: g10/g10.c:316
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma digest NAMA utk passphrase"
 
-#: g10/g10.c:307
+#: g10/g10.c:318
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
 
-#: g10/g10.c:308
+#: g10/g10.c:319
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: g10/g10.c:309
+#: g10/g10.c:320
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: g10/g10.c:310
+#: g10/g10.c:321
 msgid "|N|use compress algorithm N"
 msgstr "|N|gunakan algoritma kompresi N"
 
-#: g10/g10.c:311
+#: g10/g10.c:322
 msgid "throw keyid field of encrypted packets"
 msgstr "buang field keyid paket terenkripsi"
 
-#: g10/g10.c:312
+#: g10/g10.c:323
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAMA=NILAI|gunakan notasi data ini"
 
-#: g10/g10.c:315
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:318
+#: g10/g10.c:329
 msgid ""
 "@\n"
 "Examples:\n"
@@ -659,15 +674,15 @@
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/g10.c:418
+#: g10/g10.c:438
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Silakan laporkan kesalahan ke <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:422
+#: g10/g10.c:442
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/g10.c:425
+#: g10/g10.c:445
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -677,7 +692,7 @@
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/g10.c:432
+#: g10/g10.c:452
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -685,186 +700,191 @@
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/g10.c:511
+#: g10/g10.c:531
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/g10.c:564
+#: g10/g10.c:584
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/g10.c:704
+#: g10/g10.c:734
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/g10.c:708
+#: g10/g10.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/g10.c:715
+#: g10/g10.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/g10.c:905
+#: g10/g10.c:950
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/g10.c:970
+#: g10/g10.c:1024
 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
+#: g10/g10.c:1028 g10/g10.c:1037
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/g10.c:976
+#: g10/g10.c:1030
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/g10.c:979
+#: g10/g10.c:1033
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/g10.c:998 g10/g10.c:1010
+#: g10/g10.c:1053 g10/g10.c:1065
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:1004 g10/g10.c:1016
+#: g10/g10.c:1059 g10/g10.c:1071
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1075
 msgid "the given policy URL is invalid\n"
 msgstr "kebijakan URL yang diberikan tidak valid\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1078
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "algoritma kompresi harus di antara %d..%d\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1080
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/g10.c:1027
+#: g10/g10.c:1082
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/g10.c:1029
+#: g10/g10.c:1084
 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:1032
+#: g10/g10.c:1087
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/g10.c:1036
+#: g10/g10.c:1091
 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:1121
+#: g10/g10.c:1176
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/g10.c:1127
+#: g10/g10.c:1182
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/g10.c:1134
+#: g10/g10.c:1189
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/g10.c:1142
+#: g10/g10.c:1197
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1210
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1223
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1237
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/g10.c:1199
+#: g10/g10.c:1254
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1262
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1270
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1278
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/g10.c:1239
+#: g10/g10.c:1294
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-user"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1297
 msgid "--delete-key user-id"
 msgstr "--delete-key id-user"
 
-#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
+#: g10/g10.c:1305
+#, fuzzy
+msgid "--delete-secret-and-public-key user-id"
+msgstr "--delete-secret-key id-user"
+
+#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "tidak dapat membuka %s: %s\n"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1357
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/g10.c:1360
+#: g10/g10.c:1423
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/g10.c:1368
+#: g10/g10.c:1431
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/g10.c:1439
+#: g10/g10.c:1502
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/g10.c:1520
+#: g10/g10.c:1589
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/g10.c:1524
+#: g10/g10.c:1593
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/g10.c:1737
+#: g10/g10.c:1805
 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:1743
+#: g10/g10.c:1811
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -872,87 +892,87 @@
 "nama notasi hanya terdiri dari huruf, digit, titik atau garis bawah dan "
 "diakhiri dengan sebuah '='\n"
 
-#: g10/g10.c:1749
+#: g10/g10.c:1817
 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:1757
+#: g10/g10.c:1825
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
-#: g10/armor.c:302
+#: g10/armor.c:306
 #, c-format
 msgid "armor: %s\n"
 msgstr "armor: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:335
 msgid "invalid armor header: "
 msgstr "header armor tidak valid: "
 
-#: g10/armor.c:338
+#: g10/armor.c:342
 msgid "armor header: "
 msgstr "header armor: "
 
-#: g10/armor.c:349
+#: g10/armor.c:353
 msgid "invalid clearsig header\n"
 msgstr "header clearsig tidak valid\n"
 
-#: g10/armor.c:401
+#: g10/armor.c:405
 msgid "nested clear text signatures\n"
 msgstr "signature teks bersarang\n"
 
-#: g10/armor.c:525
+#: g10/armor.c:529
 msgid "invalid dash escaped line: "
 msgstr "dash escaped line tidak valid: "
 
-#: g10/armor.c:537
+#: g10/armor.c:541
 msgid "unexpected armor:"
 msgstr "armor tidak terduga:"
 
-#: g10/armor.c:654
+#: g10/armor.c:667 g10/armor.c:1235
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "karakter radix64 tidak valid %02x dilewati\n"
 
-#: g10/armor.c:697
+#: g10/armor.c:710
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematur (tanpa CRC)\n"
 
-#: g10/armor.c:731
+#: g10/armor.c:744
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematur (dalam CRC)\n"
 
-#: g10/armor.c:735
+#: g10/armor.c:748
 msgid "malformed CRC\n"
 msgstr "CRC tidak tepat\n"
 
-#: g10/armor.c:739
+#: g10/armor.c:752 g10/armor.c:1272
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "kesalahan CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:772
 msgid "premature eof (in Trailer)\n"
 msgstr "eof prematur (dalam Trailer)\n"
 
-#: g10/armor.c:760
+#: g10/armor.c:776
 msgid "error in trailer line\n"
 msgstr "kesalahan dalam garis trailer\n"
 
-#: g10/armor.c:906
+#: g10/armor.c:922
 msgid "For info see http://www.gnupg.org"
 msgstr ""
 
-#: g10/armor.c:1027
+#: g10/armor.c:1050
 msgid "no valid OpenPGP data found.\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/armor.c:1032
+#: g10/armor.c:1055
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armor tidak valid: baris melebihi %d karakter\n"
 
-#: g10/armor.c:1036
+#: g10/armor.c:1059
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -961,7 +981,7 @@
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "            Fingerprint:"
 
@@ -1189,58 +1209,58 @@
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "        Tidak pasti signature milik pemilik.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: dilewati: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: dilewati: kunci publik telah ada\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
 msgstr "Anda tidak menspesifikasikan ID user. (anda dapat gunakan \"-r\")\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "Masukkan ID user: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "Tidak ada ID user tersebut.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 msgid "skipped: public key already set as default recipient\n"
 msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
 msgstr "Kunci publik dimatikan.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "dilewati: kunci publik telah diset dengan --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: kesalahan memeriksa kunci: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: dilewati: kunci publik dimatikan\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "tidak ada alamat yang valid\n"
 
@@ -1248,62 +1268,66 @@
 msgid "writing self signature\n"
 msgstr "menulis self signature\n"
 
-#: g10/keygen.c:214
+#: g10/keygen.c:217
 msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
-#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
+#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
+#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:549
 msgid "Please select what kind of key you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:551
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:552
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:554
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:546
+#: g10/keygen.c:555
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "  (%d) ElGamal (tandai dan enkripsi)\n"
 
-#: g10/keygen.c:548
+#: g10/keygen.c:557
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "  (%d) ElGamal (tandai dan enkripsi)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:561
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
-#: g10/keygen.c:563 g10/keygen.c:571
+#: g10/keygen.c:572
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Anda ingin membuat kunci sign dan enkripsi? "
 
-#: g10/keygen.c:585
+#: g10/keygen.c:580
+msgid "The use of this algorithm is deprecated - create anyway? "
+msgstr ""
+
+#: g10/keygen.c:594
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/keygen.c:597
+#: g10/keygen.c:606
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1316,19 +1340,19 @@
 "       keysize default adalah 1024 bit\n"
 " keysize tertinggi dianjurkan 2048 bit\n"
 
-#: g10/keygen.c:604
+#: g10/keygen.c:613
 msgid "What keysize do you want? (1024) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:609
+#: g10/keygen.c:618
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA hanya membolehkan keysize dari 512 hingga 1024\n"
 
-#: g10/keygen.c:611
+#: g10/keygen.c:620
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
 
-#: g10/keygen.c:613
+#: g10/keygen.c:622
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
@@ -1341,12 +1365,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:624
+#: g10/keygen.c:633
 #, 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:629
+#: g10/keygen.c:638
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1354,11 +1378,11 @@
 "Keysize lebih besar dari 2048 tidak dianjurkan karena\n"
 "komputasi akan sangat lama!\n"
 
-#: g10/keygen.c:632
+#: g10/keygen.c:641
 msgid "Are you sure that you want this keysize? "
 msgstr "Apakah anda yakin memerlukan keysize ini? "
 
-#: g10/keygen.c:633
+#: g10/keygen.c:642
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1366,21 +1390,21 @@
 "Oke, tetapi ingat bahwa radiasi monitor dan keyboard anda juga sangat mudah "
 "diserang!\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:650
 msgid "Do you really need such a large keysize? "
 msgstr "Apakah anda perlu keysize berukuran besar tersebut? "
 
-#: g10/keygen.c:647
+#: g10/keygen.c:656
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:650 g10/keygen.c:654
+#: g10/keygen.c:659 g10/keygen.c:663
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:702
+#: g10/keygen.c:711
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1396,35 +1420,35 @@
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:717
+#: g10/keygen.c:726
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:722
+#: g10/keygen.c:731
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:727
+#: g10/keygen.c:736
 msgid "Key does not expire at all\n"
 msgstr "Kunci tidak pernah berakhir\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:733
+#: g10/keygen.c:742
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Kunci berakhir pada %s\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:745
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:741
+#: g10/keygen.c:750
 msgid "Is this correct (y/n)? "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:784
+#: g10/keygen.c:793
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1439,44 +1463,44 @@
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 
-#: g10/keygen.c:796
+#: g10/keygen.c:805
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:804
+#: g10/keygen.c:813
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:806
+#: g10/keygen.c:815
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:808
+#: g10/keygen.c:817
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:816
+#: g10/keygen.c:825
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:827
+#: g10/keygen.c:836
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:835
+#: g10/keygen.c:844
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:841
+#: g10/keygen.c:850
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:864
+#: g10/keygen.c:873
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:870
+#: g10/keygen.c:879
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1486,28 +1510,28 @@
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:883
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:879
+#: g10/keygen.c:888
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:889
+#: g10/keygen.c:898
 #, 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:890
+#: g10/keygen.c:899
 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:909
+#: g10/keygen.c:918
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:947
+#: g10/keygen.c:956
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1515,11 +1539,11 @@
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:964
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "passphrase tidak diulang dengan benar; coba lagi.\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:970
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1531,7 +1555,7 @@
 "saat,\n"
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 
-#: g10/keygen.c:982
+#: g10/keygen.c:991
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1543,29 +1567,29 @@
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:1431
+#: g10/keygen.c:1440
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Keypair DSA akan memiliki 1024 bit.\n"
 
-#: g10/keygen.c:1474
+#: g10/keygen.c:1483
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1581
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis sertifikat publik ke `%s'\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1582
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis sertifikat rahasia ke `%s'\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1679
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1684
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1574,30 +1598,30 @@
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:1690 g10/keygen.c:1791
+#: g10/keygen.c:1701 g10/keygen.c:1807
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1748 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:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1750 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:1769
+#: g10/keygen.c:1783
 msgid "Really create? "
 msgstr "Ingin diciptakan? "
 
-#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1608,17 +1632,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: PERINGATAN: file kosong\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Membaca dari `%s'\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s dienkripsi untuk: %s\n"
@@ -1643,282 +1667,282 @@
 msgid "key %08lX: not protected - skipped\n"
 msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr "PERINGATAN: tidak ada yang diekspor\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:214
 msgid "too many entries in pk cache - disabled\n"
 msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n"
 
-#: g10/getkey.c:350
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+#, fuzzy
+msgid "[User id not found]"
+msgstr "%s: user tidak ditemukan\n"
+
+#: g10/getkey.c:453
 msgid "too many entries in unk cache - disabled\n"
 msgstr "terlalu banyak masukan di unk cache - ditiadakan\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr "Kunci RSA tidak dapat digunakan pada versi ini\n"
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
-msgstr "Tidak ada kunci untuk ID user\n"
-
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
-msgstr "Tidak ada ID user untuk kunci\n"
-
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2207
 #, 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:2050
-#, fuzzy
-msgid "[User id not found]"
-msgstr "%s: user tidak ditemukan\n"
+#: g10/getkey.c:2249 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/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "melewati blok tipe %d\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 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:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Jumlah yang telah diproses: %lu\n"
 
-#: g10/import.c:206
+#: g10/import.c:208
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "          subkey baru: %lu\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         tanpa ID user: %lu\n"
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr "             diimpor: %lu"
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "            tidak berubah: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         ID user baru: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          subkey baru: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "       signature baru: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  pembatalan kunci baru: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     kunci rahasia dibaca: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  kunci rahasia diimpor: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " kunci rahasia tetap: %lu\n"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user yang valid\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
 
-#: g10/import.c:418 g10/import.c:657
+#: g10/import.c:435 g10/import.c:684
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
 
-#: g10/import.c:423
+#: g10/import.c:440
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "tidak ada keyring publik baku\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "tidak dapat mengunci keyring `%s': %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "kunci %08lX: kunci publik diimpor\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:489 g10/import.c:692
 #, 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:478 g10/import.c:671
+#: g10/import.c:495 g10/import.c:698
 #, 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:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "kunci %08lX: 1 user ID baru\n"
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "kunci %08lX: %d user ID baru\n"
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "kunci %08lX: 1 signature baru\n"
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "kunci %08lX: %d signature baru\n"
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "kunci %08lX: 1 subkey baru\n"
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "kunci %08lX: %d subkey baru\n"
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "kunci %08lX: tidak berubah\n"
 
-#: g10/import.c:613
+#: g10/import.c:610
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:640
 #, 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:617
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "kunci %08lX: sudah ada di keyring rahasia\n"
 
-#: g10/import.c:622
+#: g10/import.c:649
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
 
-#: g10/import.c:651
+#: g10/import.c:678
 #, 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:682
+#: g10/import.c:709
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
 
-#: g10/import.c:714
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "kunci %08lX: sertifikat pembatalan diimpor\n"
 
-#: g10/import.c:756
+#: g10/import.c:783
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
 
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:790 g10/import.c:814
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:764
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "kunci %08lX: self-signature tidak valid\n"
 
-#: g10/import.c:779
+#: g10/import.c:806
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
 
-#: g10/import.c:788
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
 
-#: g10/import.c:815
+#: g10/import.c:842
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "kunci %08lX: menerima ID user yang tidak self-signed "
 
-#: g10/import.c:844
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:867
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
@@ -1927,98 +1951,98 @@
 #. * 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:892
+#: g10/import.c:919
 #, 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:901
+#: g10/import.c:928
 #, 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:909
+#: g10/import.c:936
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
 
-#: g10/import.c:1009
+#: g10/import.c:1036
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:1060
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "kunci %08lX: penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "kunci %08lX: salinan kita tidak memiliki self-signature\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: user tidak ditemukan\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr "[pembatalan]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr "[self-signature]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
 msgstr "1 signature yang buruk\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signature yang buruk\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signature tidak diperiksa karena kesalahan\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signature tidak diperiksa karena ada kesalahan\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "terdeteksi 1 ID user tanpa self-signature yang valid\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "terdeteksi ID %d user tanpa self-signature yang valid\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Sudah ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2026,7 +2050,7 @@
 "Apakah anda yakin untuk menandai kunci ini \n"
 "dengan kunci anda: "
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2034,34 +2058,34 @@
 "Signature akan ditandai sebagai tidak dapat diekspor.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "Kunci ini tidak diproteksi.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:432
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "kunci rahasia tidak ada"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "Kunci diproteksi.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tidak dapat mengedit kunci ini: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2069,7 +2093,7 @@
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2077,591 +2101,594 @@
 "Anda tidak ingin passphrase - bukan ide yang baik!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "Apakah anda ingin melakukan hal ini? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr "memindahkan signature kunci ke tempat yang tepat\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr "simpan"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "simpan dan berhenti"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr "bantuan"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr "tampilkan"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
 msgstr "tampilkan kunci dan ID user"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr "kunci"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "pilih kunci sekunder N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr "periksa"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr "tampilkan signature"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr "tandai"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr "tandai kunci"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
 msgstr "tambah sebuah ID user"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
 msgstr "hapus ID user"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr "tambah kunci sekunder"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "hapus kunci sekunder"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
 msgstr "hapus signature"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "ubah tampilan kunci rahasia dan publik"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606 g10/keyedit.c:607
 msgid "list preferences"
 msgstr "tampilkan preferensi"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "pref"
+
+#: g10/keyedit.c:608
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:608
 msgid "change the passphrase"
 msgstr "ubah passphrase"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "change the ownertrust"
 msgstr "ubah ownertrust"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revoke signatures"
 msgstr "batalkan signature"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revoke a secondary key"
 msgstr "batalkan kunci sekunder"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable a key"
 msgstr "tiadakan kunci"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable a key"
 msgstr "aktifkan kunci"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:633
 msgid "can't do that in batchmode\n"
 msgstr "tidak dapat dilakukan dalam mode batch\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:669
+#: g10/keyedit.c:671
 msgid "Secret key is available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:700
 msgid "Command> "
 msgstr "Perintah> "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 msgid "Need the secret key to do this.\n"
 msgstr "Perlu kunci rahasia.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:781
 msgid "Really sign all user IDs? "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:782
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:814 g10/keyedit.c:1000
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "gagal perbarui trustdb: %s\n"
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:825 g10/keyedit.c:846
 msgid "You must select at least one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:827
 msgid "You can't delete the last user ID!\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:830
 msgid "Really remove all selected user IDs? "
 msgstr "Hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:831
 msgid "Really remove this user ID? "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:867 g10/keyedit.c:889
 msgid "You must select at least one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:871
 msgid "Do you really want to delete the selected keys? "
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:872
 msgid "Do you really want to delete this key? "
 msgstr "Anda ingin menghapus kunci ini? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Anda ingin membatalkan kunci terpilih ini? "
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:894
 msgid "Do you really want to revoke this key? "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
 msgid "Save changes? "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:967
 msgid "Quit without saving? "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:978
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:985
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:992
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1007
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1090
+#: g10/keyedit.c:1140
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1144
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1173
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "kunci %08lX: subkey telah dibatalkan!\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1176
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "  pembatalan kunci baru: %lu\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1178
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1420
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1424
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1428
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1434
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1448
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1449
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1452
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1527
 msgid "Please select at most one secondary key.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1531
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1575
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1591
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1652
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1698
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Tidak ada kunci sekunder dengan index %d\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1796
 msgid "user ID: \""
 msgstr "ID user: "
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1799
 #, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1803
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1827
 msgid "You have signed these user IDs:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   ditandai oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1846
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1866
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1884
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1913
 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:400 g10/mainproc.c:790
+#: g10/keylist.c:279 g10/mainproc.c:851
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Kunci berakhir pada %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:269
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "kunci publik adalah %08lX\n"
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:314
 msgid "public key encrypted data: good DEK\n"
 msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:366
 #, 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:336
+#: g10/mainproc.c:376
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr "tidak tersedia kunci rahasia untuk dekripsi\n"
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:390
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:430
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:435
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:440
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "gagal dekripsi: %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:459
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:461
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nama file asli='%.*s'\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:632
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:719 g10/mainproc.c:728
 msgid "WARNING: invalid notation data found\n"
 msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:731
 msgid "Notation: "
 msgstr "Notasi: "
 
-#: g10/mainproc.c:680
+#: g10/mainproc.c:740
 msgid "Policy: "
 msgstr "Kebijakan: "
 
-#: g10/mainproc.c:1121
+#: g10/mainproc.c:1193
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak optimal\n"
 
-#: g10/mainproc.c:1158
+#. plaintext before signatures but no one-pass packets
+#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#, fuzzy
+msgid "can't handle these multiple signatures\n"
+msgstr "buat detached signature"
+
+#: g10/mainproc.c:1256
 #, 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:1184 g10/mainproc.c:1195
+#: g10/mainproc.c:1284 g10/mainproc.c:1292
 msgid "BAD signature from \""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1196
+#: g10/mainproc.c:1285 g10/mainproc.c:1293
 msgid "Good signature from \""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1243
+#: g10/mainproc.c:1358
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:1318
+#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "buat detached signature"
+
+#: g10/mainproc.c:1454
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature tidak dikenal"
 
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1511
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1518
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "tidak dapat meniadakan core dump: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Algoritma eksperimental sebaiknya tidak dipakai!\n"
 
-#: g10/misc.c:234
-msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
+#: g10/misc.c:238
+#, fuzzy
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
 "algoritma cipher ini didepresiasi; silakan gunakan yang lebih standar!\n"
 
@@ -2670,12 +2697,68 @@
 msgid "can't handle public key algorithm %d\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/parse-packet.c:991
+#: g10/parse-packet.c:1010
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
 
-#: g10/passphrase.c:159
+#: g10/passphrase.c:223
+msgid "gpg-agent is not available in this session\n"
+msgstr ""
+
+#: g10/passphrase.c:229
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr ""
+
+#: g10/hkp.c:167 g10/passphrase.c:248
+#, fuzzy, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "tidak dapat membuka `%s': %s\n"
+
+#: g10/passphrase.c:313 g10/passphrase.c:576
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr " (ID kunci utama %08lX)"
+
+#: g10/passphrase.c:323
+#, fuzzy, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"\n"
+"Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
+"pemakai: \""
+
+#: g10/passphrase.c:344
+#, fuzzy
+msgid "Enter passphrase\n"
+msgstr "Masukkan passphrase: "
+
+#: g10/passphrase.c:346
+#, fuzzy
+msgid "Repeat passphrase\n"
+msgstr "Ulangi passphrase: "
+
+#: g10/passphrase.c:384
+msgid "passphrase too long\n"
+msgstr ""
+
+#: g10/passphrase.c:396
+msgid "invalid response from agent\n"
+msgstr ""
+
+#: g10/passphrase.c:405
+msgid "cancelled by user\n"
+msgstr ""
+
+#: g10/passphrase.c:408 g10/passphrase.c:477
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr ""
+
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2685,25 +2768,20 @@
 "Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
 "pemakai: \""
 
-#: g10/passphrase.c:168
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
 
-#: g10/passphrase.c:173
-#, c-format
-msgid " (main key ID %08lX)"
-msgstr " (ID kunci utama %08lX)"
-
-#: g10/passphrase.c:190
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
 msgstr "tidak dapat meminta password dalam mode batch\n"
 
-#: g10/passphrase.c:194
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr "Masukkan passphrase: "
 
-#: g10/passphrase.c:198
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr "Ulangi passphrase: "
 
@@ -2711,20 +2789,25 @@
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data tidak disimpan; gunakan pilihan \"--output\" untuk menyimpannya\n"
 
-#: g10/plaintext.c:324
+#: g10/plaintext.c:332
 #, fuzzy
 msgid "Detached signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/plaintext.c:328
+#: g10/plaintext.c:336
 msgid "Please enter name of data file: "
 msgstr "Silakan masukkan nama file data: "
 
-#: g10/plaintext.c:349
+#: g10/plaintext.c:357
 msgid "reading stdin ...\n"
 msgstr "membaca stdin ...\n"
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:391
+#, fuzzy
+msgid "no signed data\n"
+msgstr "tidak dapat membuka data tertandai `%s'\n"
+
+#: g10/plaintext.c:399
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "tidak dapat membuka data tertandai `%s'\n"
@@ -2757,41 +2840,36 @@
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "CATATAN: kunci signature berakhir %s\n"
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr ""
 
-#: g10/hkp.c:85
+#: g10/hkp.c:83
 #, fuzzy, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "impor kunci dari key server"
 
-#: g10/hkp.c:109 g10/hkp.c:148
+#: g10/hkp.c:102 g10/hkp.c:136
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/hkp.c:117
+#: g10/hkp.c:110
 #, fuzzy, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: 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:194
+#: g10/hkp.c:191
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:203
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:209
+#: g10/hkp.c:206
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
@@ -2834,30 +2912,35 @@
 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:324
-#, c-format
-msgid "NOTE: signature key expired %s\n"
+#: g10/sig-check.c:328
+#, fuzzy, c-format
+msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "CATATAN: kunci signature berakhir %s\n"
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "mengasumsikan signature buruk karena ada bit kritik tidak dikenal\n"
 
-#: g10/sign.c:140
+#: g10/sign.c:152
+#, fuzzy, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "Tidak dapat memeriksa signature: %s\n"
+
+#: g10/sign.c:161
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s signature dari: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:307 g10/sign.c:630
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:405
 msgid "signing:"
 msgstr "menandai:"
 
-#: g10/sign.c:431
+#: g10/sign.c:448
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "PERINGATAN: `%s' adalah file kosong\n"
@@ -2896,7 +2979,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: direktori tidak ada!\n"
 
-#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
+#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: tidak dapat membuat: %s\n"
@@ -3076,11 +3159,6 @@
 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"
@@ -3289,14 +3367,14 @@
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "PERINGATAN: belum dapat menangani record pref panjang\n"
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
@@ -3306,41 +3384,51 @@
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: tidak dapat membuat keyring: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1374
+#: g10/ringedit.c:319 g10/ringedit.c:1376
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: keyring tercipta\n"
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1557
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "PERINGATAN: terdapat 2 file dengan informasi penting.\n"
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1558
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s adalah yang tidak berubah\n"
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1559
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s adalah yang baru\n"
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1560
 msgid "Please fix this possible security flaw\n"
 msgstr "Silakan perbaikan kemungkinan lubang keamanan\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "kunci tidak dianggap sebagai tidak aman - tidak dapat digunakan dengan RNG "
 "palsu!\n"
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, fuzzy, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "melewati `%s': %s\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "melewati `%s': %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+#, fuzzy
+msgid "skipped: secret key already present\n"
+msgstr "%s: dilewati: kunci publik telah ada\n"
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3368,31 +3456,31 @@
 msgid "Enter new filename"
 msgstr "Masukkan nama file baru"
 
-#: g10/openfile.c:182
+#: g10/openfile.c:184
 msgid "writing to stdout\n"
 msgstr "menulis ke stdout\n"
 
-#: g10/openfile.c:261
+#: g10/openfile.c:273
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "mengasumsikan data bertanda dalam `%s'\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:323
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: file pilihan baru tercipta\n"
 
-#: g10/openfile.c:338
+#: g10/openfile.c:350
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: tidak dapat membuat direktori: %s\n"
 
-#: g10/openfile.c:341
+#: g10/openfile.c:353
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: direktori tercipta\n"
 
-#: g10/openfile.c:343
+#: g10/openfile.c:355
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 
@@ -3412,6 +3500,11 @@
 msgstr ""
 "PERINGATAN: pesan dienkripsi dengan kunci lemah dalam cipher simetrik.\n"
 
+#: g10/encr-data.c:97
+#, fuzzy
+msgid "problem handling encrypted packet\n"
+msgstr "buang field keyid paket terenkripsi"
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "kunci lemah tercipta - mengulang\n"
@@ -3422,14 +3515,6 @@
 msgstr ""
 "tidak dapat menghindari kunci lemah untuk cipher simetrik; mencoba %d kali!\n"
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "terdapat kunci rahasia untuk kunci publik ini!\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "tidak dapat dilakukan dalam mode batch tanpa \"--yes\"\n"
@@ -3442,6 +3527,14 @@
 msgid "This is a secret key! - really delete? "
 msgstr "Ini adalah kunci rahasia! - Yakin dihapus? "
 
+#: g10/delkey.c:181
+msgid "there is a secret key for this public key!\n"
+msgstr "terdapat kunci rahasia untuk kunci publik ini!\n"
+
+#: g10/delkey.c:183
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
+
 #: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
@@ -3685,6 +3778,26 @@
 #, fuzzy, c-format
 msgid "No help available for `%s'"
 msgstr "Tidak tersedia bantuan untuk `%s'"
+
+#, fuzzy
+#~ msgid "invalid"
+#~ msgstr "armor tidak valid"
+
+#, fuzzy
+#~ msgid "revoked"
+#~ msgstr "revkey"
+
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "Kunci RSA tidak dapat digunakan pada versi ini\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Tidak ada kunci untuk ID user\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Tidak ada ID user untuk kunci\n"
+
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "tidak tersedia kunci rahasia untuk dekripsi\n"
 
 #~ msgid ""
 #~ "RSA keys are deprecated; please consider creating a new key and use this key "
diff -urN gnupg-1.0.4/po/it.po gnupg-1.0.5/po/it.po
--- gnupg-1.0.4/po/it.po	Tue Oct 17 15:40:38 2000
+++ gnupg-1.0.5/po/it.po	Sun Apr 29 16:39:26 2001
@@ -1,12 +1,12 @@
 # GnuPG italian translation
-# Copyright (C) 1998, 1999 Free Software Foundation, Inc.
-# Marco d'Itri <md@linux.it>, 1998, 1999.
+# Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc.
+# Marco d'Itri <md@linux.it>, 1998, 1999, 2001.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg-1.0.0h\n"
-"POT-Creation-Date: 2000-10-16 19:22+0200\n"
-"PO-Revision-Date: 1999-12-08 15:51+02:00\n"
+"Project-Id-Version: gnupg-1.0.5\n"
+"POT-Creation-Date: 2001-04-29 16:39+0200\n"
+"PO-Revision-Date: 2001-04-23 21:15+02:00\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,35 +17,35 @@
 msgid "Warning: using insecure memory!\n"
 msgstr "Attenzione: si sta usando memoria insicura!\n"
 
-#: util/secmem.c:295
+#: util/secmem.c:299
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "l'operazione non è possibile senza memoria sicura inizializzata\n"
 
-#: util/secmem.c:296
+#: util/secmem.c:300
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:287 util/miscutil.c:316
 msgid "yes"
 msgstr "sì"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:288 util/miscutil.c:319
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:289 util/miscutil.c:317
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:290 util/miscutil.c:320
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:318
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:321
 msgid "qQ"
 msgstr "qQ"
 
@@ -246,6 +246,15 @@
 msgid "not processed"
 msgstr "non esaminato"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+msgid "unusable public key"
+msgstr "chiave pubblica inutilizzabile"
+
+#: util/errors.c:106
+msgid "unusable secret key"
+msgstr "chiave segreta inutilizzabile"
+
 #: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -256,64 +265,65 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Hai trovato un bug... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: cipher/random.c:315
-#, fuzzy, c-format
+#: cipher/random.c:324
+#, c-format
 msgid "can't stat `%s': %s\n"
-msgstr "impossibile aprire `%s': %s\n"
+msgstr "impossibile eseguire stat su `%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:329
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
-msgstr ""
+msgstr "`%s' non è un file regolare - ignorato\n"
 
-#: cipher/random.c:325
+#: cipher/random.c:334
 msgid "note: random_seed file is empty\n"
-msgstr ""
+msgstr "nota: il file random_seed è vuoto\n"
 
-#: cipher/random.c:331
+#: cipher/random.c:340
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
+"attenzione: le dimensioni del file random_seed non sono valide - non usato\n"
 
-#: cipher/random.c:339
-#, fuzzy, c-format
+#: cipher/random.c:348
+#, c-format
 msgid "can't read `%s': %s\n"
-msgstr "impossibile aprire `%s': %s\n"
+msgstr "impossibile leggere `%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:386
 msgid "note: random_seed file not updated\n"
-msgstr ""
+msgstr "nota: il file random_seed non è stato aggiornato\n"
 
-#: cipher/random.c:397
-#, fuzzy, c-format
+#: cipher/random.c:406
+#, c-format
 msgid "can't create `%s': %s\n"
-msgstr "impossibile creare %s: %s\n"
+msgstr "impossibile creare `%s': %s\n"
 
-#: cipher/random.c:404
-#, fuzzy, c-format
+#: cipher/random.c:413
+#, c-format
 msgid "can't write `%s': %s\n"
-msgstr "impossibile aprire `%s': %s\n"
+msgstr "impossibile scrivere su `%s': %s\n"
 
-#: cipher/random.c:407
-#, fuzzy, c-format
+#: cipher/random.c:416
+#, c-format
 msgid "can't close `%s': %s\n"
-msgstr "impossibile aprire `%s': %s\n"
+msgstr "impossibile chiudere `%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:427
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
-msgstr ""
+msgstr "sono stati richiesti troppi bit casuali; il limite è %d\n"
 
-#: cipher/random.c:650
+#: cipher/random.c:661
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATTENZIONE: si sta usando un generatore di numeri casuali non sicuro!!\n"
 
-#: cipher/random.c:651
+#: cipher/random.c:662
 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 +349,7 @@
 "altra cosa per dare all'OS la possibilità di raccogliere altra entropia!\n"
 "(Servono altri %d byte)\n"
 
-#: g10/g10.c:206
+#: g10/g10.c:216
 msgid ""
 "@Commands:\n"
 " "
@@ -347,139 +357,139 @@
 "@Comandi:\n"
 " "
 
-#: g10/g10.c:208
+#: g10/g10.c:218
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/g10.c:209
+#: g10/g10.c:219
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/g10.c:210
+#: g10/g10.c:220
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/g10.c:211
+#: g10/g10.c:221
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/g10.c:212
+#: g10/g10.c:222
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/g10.c:213
+#: g10/g10.c:223
 msgid "store only"
 msgstr "immagazzina soltanto"
 
-#: g10/g10.c:214
+#: g10/g10.c:224
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/g10.c:215
+#: g10/g10.c:225
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:217
+#: g10/g10.c:227
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/g10.c:219
+#: g10/g10.c:229
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/g10.c:220
+#: g10/g10.c:230
 msgid "check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/g10.c:221
+#: g10/g10.c:231
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/g10.c:222
+#: g10/g10.c:232
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/g10.c:223
+#: g10/g10.c:233
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/g10.c:224
+#: g10/g10.c:234
 msgid "remove key from the public keyring"
 msgstr "rimuove una chiave dal portachiavi pubblico"
 
-#: g10/g10.c:226
+#: g10/g10.c:236
 msgid "remove key from the secret keyring"
 msgstr "rimuove una chiave dal portachiavi privato"
 
-#: g10/g10.c:227
+#: g10/g10.c:237
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/g10.c:228
+#: g10/g10.c:238
 msgid "sign a key locally"
 msgstr "firma localmente una chiave"
 
-#: g10/g10.c:229
+#: g10/g10.c:239
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/g10.c:230
+#: g10/g10.c:240
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/g10.c:231
+#: g10/g10.c:241
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/g10.c:232
+#: g10/g10.c:242
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/g10.c:233
+#: g10/g10.c:243
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/g10.c:237
+#: g10/g10.c:247
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/g10.c:239
+#: g10/g10.c:249
 msgid "list only the sequence of packets"
 msgstr "elenca solo la sequenza dei pacchetti"
 
-#: g10/g10.c:241
+#: g10/g10.c:251
 msgid "export the ownertrust values"
 msgstr "esporta i valori di fiducia"
 
-#: g10/g10.c:243
+#: g10/g10.c:253
 msgid "import ownertrust values"
 msgstr "importa i valori di fiducia"
 
-#: g10/g10.c:245
+#: g10/g10.c:255
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/g10.c:247
+#: g10/g10.c:257
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMI]|controlla il database della fiducia"
 
-#: g10/g10.c:248
+#: g10/g10.c:258
 msgid "fix a corrupted trust database"
 msgstr "ripara un database della fiducia rovinato"
 
-#: g10/g10.c:249
+#: g10/g10.c:259
 msgid "De-Armor a file or stdin"
 msgstr "rimuovi l'armatura a un file o a stdin"
 
-#: g10/g10.c:251
+#: g10/g10.c:261
 msgid "En-Armor a file or stdin"
 msgstr "crea l'armatura a un file o a stdin"
 
-#: g10/g10.c:253
+#: g10/g10.c:263
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/g10.c:257
+#: g10/g10.c:267
 msgid ""
 "@\n"
 "Options:\n"
@@ -489,160 +499,166 @@
 "Opzioni:\n"
 " "
 
-#: g10/g10.c:259
+#: g10/g10.c:269
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/g10.c:261
+#: g10/g10.c:271
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/g10.c:264
+#: g10/g10.c:274
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: g10/g10.c:266
+#: g10/g10.c:276
 msgid "use the default key as default recipient"
 msgstr "usa la chiave predefinita come destinatario predefinito"
 
-#: g10/g10.c:270
+#: g10/g10.c:280
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/g10.c:271
+#: g10/g10.c:281
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/g10.c:273
+#: g10/g10.c:283
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/g10.c:274
+#: g10/g10.c:284
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/g10.c:275
+#: g10/g10.c:285
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/g10.c:276
+#: g10/g10.c:286
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: g10/g10.c:277
+#: g10/g10.c:287
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: g10/g10.c:278
+#: g10/g10.c:288
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/g10.c:279
+#: g10/g10.c:289
 msgid "always use a MDC for encryption"
 msgstr "usa sempre un MDC per cifrare"
 
-#: g10/g10.c:280
+#: g10/g10.c:290
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:282
+#: g10/g10.c:292
+msgid "use the gpg-agent"
+msgstr "usa gpg-agent"
+
+#: g10/g10.c:293
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: g10/g10.c:283
+#: g10/g10.c:294
 msgid "assume yes on most questions"
 msgstr "assumi \"sì\" per quasi tutte le domande"
 
-#: g10/g10.c:284
+#: g10/g10.c:295
 msgid "assume no on most questions"
 msgstr "assumi \"no\" per quasi tutte le domande"
 
-#: g10/g10.c:285
+#: g10/g10.c:296
 msgid "add this keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: g10/g10.c:286
+#: g10/g10.c:297
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: g10/g10.c:287
+#: g10/g10.c:298
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME come chiave segreta predefinita"
 
-#: g10/g10.c:288
+#: g10/g10.c:299
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: g10/g10.c:289
+#: g10/g10.c:300
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOME|imposta il set di caratteri del terminale NOME"
 
-#: g10/g10.c:290
+#: g10/g10.c:301
 msgid "read options from file"
 msgstr "leggi le opzioni dal file"
 
-#: g10/g10.c:294
+#: g10/g10.c:305
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato su questo FD"
 
-#: g10/g10.c:299
+#: g10/g10.c:310
 msgid "|KEYID|ulimately trust this key"
-msgstr ""
+msgstr "|KEYID|assegna fiducia definitiva a questa chiave"
 
-#: g10/g10.c:300
+#: g10/g10.c:311
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: g10/g10.c:301
+#: g10/g10.c:312
 msgid "emulate the mode described in RFC1991"
 msgstr "emula il modo descritto in RFC 1991"
 
-#: g10/g10.c:302
+#: g10/g10.c:313
 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:303
+#: g10/g10.c:314
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa il modo N per la passphrase"
 
-#: g10/g10.c:305
+#: g10/g10.c:316
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOME|usa l'algoritmo di message digest NOME per le passphrase"
 
-#: g10/g10.c:307
+#: g10/g10.c:318
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
 
-#: g10/g10.c:308
+#: g10/g10.c:319
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di cifratura NOME"
 
-#: g10/g10.c:309
+#: g10/g10.c:320
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di message digest NOME"
 
-#: g10/g10.c:310
+#: g10/g10.c:321
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: g10/g10.c:311
+#: g10/g10.c:322
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina il campo keyid dei pacchetti cifrati"
 
-#: g10/g10.c:312
+#: g10/g10.c:323
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALORE|usa questi dati per una nota"
 
-#: g10/g10.c:315
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
+"@\n"
+"(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/g10.c:318
+#: g10/g10.c:329
 msgid ""
 "@\n"
 "Examples:\n"
@@ -662,15 +678,15 @@
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:418
+#: g10/g10.c:438
 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:422
+#: g10/g10.c:442
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/g10.c:425
+#: g10/g10.c:445
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -680,7 +696,7 @@
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:432
+#: g10/g10.c:452
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -688,188 +704,192 @@
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:511
+#: g10/g10.c:531
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/g10.c:564
+#: g10/g10.c:584
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:704
+#: g10/g10.c:734
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/g10.c:708
+#: g10/g10.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:715
+#: g10/g10.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:905
+#: g10/g10.c:950
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non è un set di caratteri valido\n"
 
-#: g10/g10.c:970
+#: g10/g10.c:1024
 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
+#: g10/g10.c:1028 g10/g10.c:1037
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/g10.c:976
+#: g10/g10.c:1030
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non è permesso usare %s con %s!\n"
 
-#: g10/g10.c:979
+#: g10/g10.c:1033
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/g10.c:998 g10/g10.c:1010
+#: g10/g10.c:1053 g10/g10.c:1065
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non è valido\n"
 
-#: g10/g10.c:1004 g10/g10.c:1016
+#: g10/g10.c:1059 g10/g10.c:1071
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non è valido\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1075
 msgid "the given policy URL is invalid\n"
 msgstr "L'URL della policy indicato non è valido\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1078
 #, 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:1025
+#: g10/g10.c:1080
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:1027
+#: g10/g10.c:1082
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:1029
+#: g10/g10.c:1084
 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:1032
+#: g10/g10.c:1087
 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:1036
+#: g10/g10.c:1091
 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:1121
+#: g10/g10.c:1176
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:1127
+#: g10/g10.c:1182
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:1134
+#: g10/g10.c:1189
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:1142
+#: g10/g10.c:1197
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1210
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1223
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1237
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:1199
+#: g10/g10.c:1254
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1262
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1270
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1278
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/g10.c:1239
+#: g10/g10.c:1294
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key user-id"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1297
 msgid "--delete-key user-id"
 msgstr "--delete-key user-id"
 
-#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
+#: g10/g10.c:1305
+msgid "--delete-secret-and-public-key user-id"
+msgstr "--delete-secret-and-public-key user-id"
+
+#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1357
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/g10.c:1360
+#: g10/g10.c:1423
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1368
+#: g10/g10.c:1431
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1439
+#: g10/g10.c:1502
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:1520
+#: g10/g10.c:1589
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:1524
+#: g10/g10.c:1593
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/g10.c:1737
+#: g10/g10.c:1805
 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:1743
+#: g10/g10.c:1811
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -877,87 +897,87 @@
 "il nome di una nota deve essere formato solo da lettere, numeri, punti o\n"
 "underscore e deve finire con `='\n"
 
-#: g10/g10.c:1749
+#: g10/g10.c:1817
 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:1757
+#: g10/g10.c:1825
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
-#: g10/armor.c:302
+#: g10/armor.c:306
 #, c-format
 msgid "armor: %s\n"
 msgstr "armatura: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:335
 msgid "invalid armor header: "
 msgstr "header dell'armatura non valido: "
 
-#: g10/armor.c:338
+#: g10/armor.c:342
 msgid "armor header: "
 msgstr "header dell'armatura: "
 
-#: g10/armor.c:349
+#: g10/armor.c:353
 msgid "invalid clearsig header\n"
 msgstr "header della firma in chiaro non valido\n"
 
-#: g10/armor.c:401
+#: g10/armor.c:405
 msgid "nested clear text signatures\n"
 msgstr "firme in chiaro annidate\n"
 
-#: g10/armor.c:525
+#: g10/armor.c:529
 msgid "invalid dash escaped line: "
 msgstr "riga protetta con il trattino non valida: "
 
-#: g10/armor.c:537
+#: g10/armor.c:541
 msgid "unexpected armor:"
 msgstr "armatura inaspettata:"
 
-#: g10/armor.c:654
+#: g10/armor.c:667 g10/armor.c:1235
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Carattere radix64 non valido %02x saltato\n"
 
-#: g10/armor.c:697
+#: g10/armor.c:710
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematura (nessun CRC)\n"
 
-#: g10/armor.c:731
+#: g10/armor.c:744
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematura (nel CRC)\n"
 
-#: g10/armor.c:735
+#: g10/armor.c:748
 msgid "malformed CRC\n"
 msgstr "CRC malformato\n"
 
-#: g10/armor.c:739
+#: g10/armor.c:752 g10/armor.c:1272
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "errore nel CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:772
 msgid "premature eof (in Trailer)\n"
 msgstr "eof prematura (nella coda)\n"
 
-#: g10/armor.c:760
+#: g10/armor.c:776
 msgid "error in trailer line\n"
 msgstr "errore nella riga della coda\n"
 
-#: g10/armor.c:906
+#: g10/armor.c:922
 msgid "For info see http://www.gnupg.org"
-msgstr ""
+msgstr "Per informazioni si veda http://www.gnupg.org"
 
-#: g10/armor.c:1027
+#: g10/armor.c:1050
 msgid "no valid OpenPGP data found.\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/armor.c:1032
+#: g10/armor.c:1055
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armatura non valida: linea più lunga di %d caratteri\n"
 
-#: g10/armor.c:1036
+#: g10/armor.c:1059
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -966,7 +986,7 @@
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "       Impronta digitale:"
 
@@ -976,33 +996,31 @@
 
 #: g10/pkclist.c:116
 msgid "No reason specified"
-msgstr ""
+msgstr "Nessuna ragione specificata"
 
 #: g10/pkclist.c:118
-#, fuzzy
 msgid "Key is superseded"
-msgstr "La chiave è protetta.\n"
+msgstr "Questa chiave è stata sostituita"
 
 #: g10/pkclist.c:120
-#, fuzzy
 msgid "Key has been compromised"
-msgstr "Questa chiave è stata disabilitata"
+msgstr "Questa chiave è stata compromessa"
 
 #: g10/pkclist.c:122
 msgid "Key is no longer used"
-msgstr ""
+msgstr "La chiave non è più usata"
 
 #: g10/pkclist.c:124
 msgid "User ID is no longer valid"
-msgstr ""
+msgstr "L'user ID non è più valido"
 
 #: g10/pkclist.c:128
 msgid "Reason for revocation: "
-msgstr ""
+msgstr "Ragione della revoca: "
 
 #: g10/pkclist.c:145
 msgid "Revocation comment: "
-msgstr ""
+msgstr "Commento alla revoca: "
 
 # valid user replies (not including 1..4)
 # [Marco, you can change 'm' and 's' to whatever letters you like]
@@ -1195,17 +1213,17 @@
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Non è sicuro che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: saltata: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: saltato: chiave pubblica già presente\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1213,42 +1231,42 @@
 "Non hai specificato un user ID. (puoi usare \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "Inserisci l'user ID: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "User ID inesistente.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 msgid "skipped: public key already set as default recipient\n"
 msgstr "saltato: chiave pubblica già impostata come destinatario predefinito\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
 msgstr "La chiave pubblica è disabilitata.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "saltato: chiave pubblica già impostata con --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: errore nel controllare la chiave: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: saltato: chiave pubblica disabilitata\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
@@ -1256,62 +1274,66 @@
 msgid "writing self signature\n"
 msgstr "scrittura della autofirma\n"
 
-#: g10/keygen.c:214
+#: g10/keygen.c:217
 msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
-#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
-#, fuzzy, c-format
+#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
+#, c-format
 msgid "keysize invalid; using %u bits\n"
-msgstr "La dimensione richiesta della chiave è %u bit\n"
+msgstr "dimensione della chiave non valida; uso %u bit\n"
 
-#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
-#, fuzzy, c-format
+#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
+#, c-format
 msgid "keysize rounded up to %u bits\n"
-msgstr "arrotondate a %u bit\n"
+msgstr "dimensioni della chiave arrotondate a %u bit\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:549
 msgid "Please select what kind of key you want:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:551
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (default)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:552
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:554
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:546
+#: g10/keygen.c:555
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma e cifra)\n"
 
-#: g10/keygen.c:548
-#, fuzzy, c-format
+#: g10/keygen.c:557
+#, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (firma e cifra)\n"
+msgstr "   (%d) RSA (firma e cifra)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:561
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
-#: g10/keygen.c:563 g10/keygen.c:571
+#: g10/keygen.c:572
 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:585
+#: g10/keygen.c:580
+msgid "The use of this algorithm is deprecated - create anyway? "
+msgstr "L'uso di questo algoritmo è deprecato - la creo comunque? "
+
+#: g10/keygen.c:594
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/keygen.c:597
+#: g10/keygen.c:606
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1324,22 +1346,21 @@
 "          la dimensione predefinita è 1024 bit\n"
 "  la dimensione massima consigliata è 2048 bit\n"
 
-#: g10/keygen.c:604
+#: g10/keygen.c:613
 msgid "What keysize do you want? (1024) "
 msgstr "Di che dimensioni vuoi la chiave? (1024) "
 
-#: g10/keygen.c:609
+#: g10/keygen.c:618
 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:611
+#: g10/keygen.c:620
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "la chiave è troppo corta; 768 è il minimo valore permesso.\n"
 
-#: g10/keygen.c:613
-#, fuzzy
+#: g10/keygen.c:622
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "la chiave è troppo corta; 768 è il minimo valore permesso.\n"
+msgstr "la chiave è troppo corta; 1024 è il minimo valore permesso per RSA.\n"
 
 #. It is ridiculous and an annoyance to use larger key sizes!
 #. * GnuPG can handle much larger sizes; but it takes an eternity
@@ -1349,12 +1370,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:624
+#: g10/keygen.c:633
 #, 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:629
+#: g10/keygen.c:638
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1362,11 +1383,11 @@
 "Chiavi più lunghe di 2048 non sono consigliate perchè i calcoli sono\n"
 "VERAMENTE lunghi!\n"
 
-#: g10/keygen.c:632
+#: g10/keygen.c:641
 msgid "Are you sure that you want this keysize? "
 msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
 
-#: g10/keygen.c:633
+#: g10/keygen.c:642
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1374,21 +1395,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:641
+#: g10/keygen.c:650
 msgid "Do you really need such a large keysize? "
 msgstr "Ti serve davvero una chiave così lunga? "
 
-#: g10/keygen.c:647
+#: g10/keygen.c:656
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave è %u bit\n"
 
-#: g10/keygen.c:650 g10/keygen.c:654
+#: g10/keygen.c:659 g10/keygen.c:663
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:702
+#: g10/keygen.c:711
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1404,25 +1425,25 @@
 "      <n>m = la chiave scadrà dopo n mesi\n"
 "      <n>y = la chiave scadrà dopo n anni\n"
 
-#: g10/keygen.c:717
+#: g10/keygen.c:726
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:722
+#: g10/keygen.c:731
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:727
+#: g10/keygen.c:736
 msgid "Key does not expire at all\n"
 msgstr "La chiave non scade\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:733
+#: g10/keygen.c:742
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La chiave scadrà il %s\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:745
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1430,11 +1451,11 @@
 "Il tuo sistema non può mostrare date oltre il 2038.\n"
 "Comunque, sarà gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:741
+#: g10/keygen.c:750
 msgid "Is this correct (y/n)? "
 msgstr "È giusto (s/n)? "
 
-#: g10/keygen.c:784
+#: g10/keygen.c:793
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1450,44 +1471,44 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:796
+#: g10/keygen.c:805
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:804
+#: g10/keygen.c:813
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:806
+#: g10/keygen.c:815
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non può iniziare con una cifra\n"
 
-#: g10/keygen.c:808
+#: g10/keygen.c:817
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:816
+#: g10/keygen.c:825
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:827
+#: g10/keygen.c:836
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non è valido\n"
 
-#: g10/keygen.c:835
+#: g10/keygen.c:844
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:841
+#: g10/keygen.c:850
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:864
+#: g10/keygen.c:873
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:870
+#: g10/keygen.c:879
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1498,28 +1519,27 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:883
 msgid "Please don't put the email address into the real name or the comment\n"
-msgstr ""
+msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
 
-#: g10/keygen.c:879
+#: g10/keygen.c:888
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:889
-#, fuzzy
+#: g10/keygen.c:898
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
-msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
+msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
 
-#: g10/keygen.c:890
+#: g10/keygen.c:899
 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:909
+#: g10/keygen.c:918
 msgid "Please correct the error first\n"
-msgstr ""
+msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:947
+#: g10/keygen.c:956
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1527,11 +1547,11 @@
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:964
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "passphrase non ripetuta correttamente; riprova.\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:970
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1543,7 +1563,7 @@
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:982
+#: g10/keygen.c:991
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1555,29 +1575,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:1431
+#: g10/keygen.c:1440
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La coppia DSA avrà 1024 bit.\n"
 
-#: g10/keygen.c:1474
+#: g10/keygen.c:1483
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:1571
-#, fuzzy, c-format
+#: g10/keygen.c:1581
+#, c-format
 msgid "writing public key to `%s'\n"
-msgstr "scrittura del certificato pubblico in `%s'\n"
+msgstr "scrittura della chiave pubblica in `%s'\n"
 
-#: g10/keygen.c:1572
-#, fuzzy, c-format
+#: g10/keygen.c:1582
+#, c-format
 msgid "writing secret key to `%s'\n"
-msgstr "scrittura del certificato segreto in `%s'\n"
+msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1679
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1684
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1586,12 +1606,12 @@
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:1690 g10/keygen.c:1791
+#: g10/keygen.c:1701 g10/keygen.c:1807
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1748 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1599,7 +1619,7 @@
 "la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1750 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1607,11 +1627,11 @@
 "la chiave è stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1783
 msgid "Really create? "
 msgstr "Crea davvero? "
 
-#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1622,17 +1642,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATTENZIONE: file vuoto\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lettura da `%s'\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrato per: %s\n"
@@ -1653,286 +1673,286 @@
 msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
 
 #: g10/export.c:182
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: not protected - skipped\n"
-msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
+msgstr "chiave %08lX: non protetta - saltata\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENZIONE: non è stato esportato nulla\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:214
 msgid "too many entries in pk cache - disabled\n"
 msgstr "troppe voci nella pk cache - disabilitata\n"
 
-#: g10/getkey.c:350
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+msgid "[User id not found]"
+msgstr "[User ID non trovato]"
+
+#: g10/getkey.c:453
 msgid "too many entries in unk cache - disabled\n"
 msgstr "troppe voci nella unk cache - disabilitata\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr "In questa versione non possono essere usate chiavi RSA\n"
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
-msgstr "Non ci sono chiavi per questo user ID\n"
-
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
-msgstr "Non ci sono user ID per questa chiave\n"
-
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2207
 #, 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:2050
-#, fuzzy
-msgid "[User id not found]"
-msgstr "%s: utente non trovato\n"
+#: g10/getkey.c:2249 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/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "salto un blocco di tipo %d\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 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:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Numero totale esaminato: %lu\n"
 
-#: g10/import.c:206
-#, fuzzy, c-format
+#: g10/import.c:208
+#, c-format
 msgid "      skipped new keys: %lu\n"
-msgstr "       nuove subchiavi: %lu\n"
+msgstr "  nuove chiavi saltate: %lu\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         senza user ID: %lu\n"
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr "             importate: %lu"
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "        non modificate: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nuovi user ID: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nuove subchiavi: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           nuove firme: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "nuove revoche di chiavi: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "  chiavi segrete lette: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chiavi segrete importate: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chiavi segrete non cambiate: %lu\n"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chiave %08lX: nessun user ID valido\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo può essere causato da una autofirma mancante\n"
 
-#: g10/import.c:418 g10/import.c:657
+#: g10/import.c:435 g10/import.c:684
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/import.c:423
-#, fuzzy, c-format
+#: g10/import.c:440
+#, c-format
 msgid "key %08lX: new key - skipped\n"
-msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
+msgstr "chiave %08lX: nuova chiave - saltata\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "nessun portachiavi pubblico predefinito\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "impossibile fare il lock del portachiavi `%s': %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "chiave %08lX: chiave pubblica importata\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:489 g10/import.c:692
 #, 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:478 g10/import.c:671
+#: g10/import.c:495 g10/import.c:698
 #, 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:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "chiave %08lX: 1 nuovo user ID\n"
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "chiave %08lX: %d nuovi user ID\n"
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "chiave %08lX: una nuova firma\n"
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "chiave %08lX: %d nuove firme\n"
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "chiave %08lX: una nuova subchiave\n"
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "chiave %08lX: %d nuove subchiavi\n"
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "chiave %08lX: non cambiata\n"
 
-#: g10/import.c:613
+#: g10/import.c:610
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+"la chiave segreta %08lX non è stata importata (usa %s per permetterlo)\n"
+
+#: g10/import.c:640
 #, 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:617
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chiave %08lX: già nel portachiavi segreto\n"
 
-#: g10/import.c:622
+#: g10/import.c:649
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/import.c:651
+#: g10/import.c:678
 #, 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:682
+#: g10/import.c:709
 #, 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:714
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "chiave %08lX: certificato di revoca importato\n"
 
-#: g10/import.c:756
+#: g10/import.c:783
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chiave %08lX: nessun user ID per la firma\n"
 
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:790 g10/import.c:814
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
-#: g10/import.c:764
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "chiave %08lX: autofirma non valida\n"
 
-#: g10/import.c:779
+#: g10/import.c:806
 #, 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:788
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chiave %08lX: legame con la subchiave non valido:\n"
 
-#: g10/import.c:815
+#: g10/import.c:842
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "chiave %08lX: accettato l'user ID non autofirmato '"
 
-#: g10/import.c:844
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chiave %08lX: saltato l'user ID '"
 
-#: g10/import.c:867
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chiave %08lX: saltata la subchiave\n"
@@ -1941,98 +1961,98 @@
 #. * 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:892
+#: g10/import.c:919
 #, 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:901
+#: g10/import.c:928
 #, 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:909
+#: g10/import.c:936
 #, 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:1009
+#: g10/import.c:1036
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
 
-#: g10/import.c:1060
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca aggiunto\n"
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chiave %08lX: la nostra copia non ha autofirma\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: utente non trovato\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr "[revoca]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
 msgstr "una firma non corretta\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firme non corrette\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
 msgstr "una firma non controllata per mancanza della chiave\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d firme non controllate per mancanza delle chiavi\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
 msgstr "una firma non controllata a causa di un errore\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firme non controllate a causa di errori\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Trovato un user ID senza autofirma valida\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Trovati %d user ID senza autofirme valide\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Già firmato dalla chiave %08lX\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Niente da firmare con la chiave %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2040,7 +2060,7 @@
 "Sei davvero sicuro di volere firmare questa chiave\n"
 "con la tua chiave: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2048,34 +2068,33 @@
 "La firma sarà segnata come non esportabile.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non è protetta.\n"
 
-#: g10/keyedit.c:431
-#, fuzzy
+#: g10/keyedit.c:432
 msgid "Secret parts of primary key are not available.\n"
-msgstr "la chiave segreta non è disponibile"
+msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "La chiave è protetta.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossibile modificare questa chiave: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2083,7 +2102,7 @@
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2091,421 +2110,425 @@
 "Non vuoi una passphrase - questa è probabilmente una *cattiva* idea!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "Vuoi veramente farlo?"
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr "spostamento della firma di una chiave nel posto corretto\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "abbandona questo menù"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
 msgstr "elenca le chiavi e gli user ID"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "scegli la chiave secondaria N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr "elenca le firme"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr "firma la chiave"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
 msgstr "cancella un user ID"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr "aggiungi una chiave secondaria"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "cancella una chiave secondaria"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
 msgstr "delsign"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
 msgstr "cancella le firme"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr "cambia la data di scadenza"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606 g10/keyedit.c:607
 msgid "list preferences"
 msgstr "elenca le impostazioni"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "pref"
+
+#: g10/keyedit.c:608
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:608
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revoke signatures"
 msgstr "revoca firme"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revoke a secondary key"
 msgstr "revoca una chiave secondaria"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable a key"
 msgstr "disabilita una chiave"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable"
 msgstr "abilita"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable a key"
 msgstr "abilita una chiave"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:633
 msgid "can't do that in batchmode\n"
 msgstr "impossibile fare questo in modo batch\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:669
+#: g10/keyedit.c:671
 msgid "Secret key is available.\n"
 msgstr "È disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:700
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Please use the command \"toggle\" first.\n"
-msgstr ""
+msgstr "Per favore usa prima il comando \"toggle\".\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:781
 msgid "Really sign all user IDs? "
 msgstr "Firmo davvero tutti gli user ID? "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:782
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:814 g10/keyedit.c:1000
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "aggiornamento del trustdb fallito: %s\n"
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:825 g10/keyedit.c:846
 msgid "You must select at least one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:827
 msgid "You can't delete the last user ID!\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:830
 msgid "Really remove all selected user IDs? "
 msgstr "Tolgo davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:831
 msgid "Really remove this user ID? "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:867 g10/keyedit.c:889
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:871
 msgid "Do you really want to delete the selected keys? "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:872
 msgid "Do you really want to delete this key? "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Vuoi davvero revocare le chiavi selezionate? "
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:894
 msgid "Do you really want to revoke this key? "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
 msgid "Save changes? "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:967
 msgid "Quit without saving? "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:978
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:985
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:992
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non è cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1007
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
-msgstr ""
+msgstr "%s%c %4u%c/%08lX  creata: %s scade: %s"
 
-#: g10/keyedit.c:1090
+#: g10/keyedit.c:1140
 #, c-format
 msgid " trust: %c/%c"
-msgstr ""
+msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1144
 msgid "This key has been disabled"
 msgstr "Questa chiave è stata disabilitata"
 
-#: g10/keyedit.c:1123
-#, fuzzy, c-format
+#: g10/keyedit.c:1173
+#, c-format
 msgid "rev! subkey has been revoked: %s\n"
-msgstr "chiave %08lX: la subchiave è stata revocata!\n"
+msgstr "rev! la subchiave è stata revocata: %s\n"
 
-#: g10/keyedit.c:1126
-#, fuzzy
+#: g10/keyedit.c:1176
 msgid "rev- faked revocation found\n"
-msgstr "nuove revoche di chiavi: %lu\n"
+msgstr "rev- trovata una revoca falsificata\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1178
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
-msgstr ""
+msgstr "rev? problema controllando la revoca: %s\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1420
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1424
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1428
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1434
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1448
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1449
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1452
 msgid "Nothing deleted.\n"
 msgstr "Non è stato cancellato nulla.\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1527
 msgid "Please select at most one secondary key.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1531
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1575
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non è possibile cambiare la data di scadenza di una chiave v3\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1591
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1652
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1698
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nessuna chiave secondaria con l'indice %d\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1796
 msgid "user ID: \""
 msgstr "user ID: \""
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1799
 #, c-format
 msgid ""
 "\"\n"
@@ -2515,170 +2538,166 @@
 "firmata con la tua chiave %08lX a %s\n"
 "\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1803
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Creare un certificato di revoca per questa firma? (s/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1827
 msgid "You have signed these user IDs:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   firmata da %08lX il %s\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1846
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1866
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1884
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Creare davvero i certificati di revoca? (s/N)"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1913
 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:400 g10/mainproc.c:790
-#, fuzzy, c-format
+#: g10/keylist.c:279 g10/mainproc.c:851
+#, c-format
 msgid " [expires: %s]"
-msgstr "La chiave scadrà il %s\n"
+msgstr "[scadenza: %s]"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:269
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la chiave pubblica è %08lX\n"
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:314
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:366
 #, 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:336
+#: g10/mainproc.c:376
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "Cifrato con la chiave %s con ID %08lX\n"
 
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr "nessuna chiave disponibile per decifrare\n"
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:390
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:430
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:435
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato è stato manipolato!\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:440
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:459
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:461
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:632
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:719 g10/mainproc.c:728
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:731
 msgid "Notation: "
 msgstr "Nota: "
 
-#: g10/mainproc.c:680
+#: g10/mainproc.c:740
 msgid "Policy: "
 msgstr "Policy: "
 
-#: g10/mainproc.c:1121
+#: g10/mainproc.c:1193
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:1158
+#. plaintext before signatures but no one-pass packets
+#: g10/mainproc.c:1235 g10/mainproc.c:1245
+msgid "can't handle these multiple signatures\n"
+msgstr "impossibile gestire queste firme multiple\n"
+
+#: g10/mainproc.c:1256
 #, 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:1184 g10/mainproc.c:1195
+#: g10/mainproc.c:1284 g10/mainproc.c:1292
 msgid "BAD signature from \""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1196
+#: g10/mainproc.c:1285 g10/mainproc.c:1293
 msgid "Good signature from \""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr "    anche noto come \""
 
-#: g10/mainproc.c:1243
+#: g10/mainproc.c:1358
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1318
+#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+msgid "not a detached signature\n"
+msgstr "non è una firma separata\n"
+
+#: g10/mainproc.c:1454
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1511
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1518
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossibile disabilitare i core dump: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Gli algoritmi sperimentali non dovrebbero essere usati!\n"
 
-#: g10/misc.c:234
-msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
+#: g10/misc.c:238
+#, fuzzy
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr "questo algoritmo di cifratura è deprecato; usane uno più standard!\n"
 
 #: g10/parse-packet.c:119
@@ -2686,12 +2705,66 @@
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/parse-packet.c:991
+#: g10/parse-packet.c:1010
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
 
-#: g10/passphrase.c:159
+#: g10/passphrase.c:223
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent non è disponibile in questa sessione\n"
+
+#: g10/passphrase.c:229
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
+
+#: g10/hkp.c:167 g10/passphrase.c:248
+#, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "impossibile connettersi a `%s': %s\n"
+
+#: g10/passphrase.c:313 g10/passphrase.c:576
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr " (key ID principale %08lX)"
+
+#: g10/passphrase.c:323
+#, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"Ti serve una passphrase per sbloccare la chiave segreta dell'utente:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+
+#: g10/passphrase.c:344
+msgid "Enter passphrase\n"
+msgstr "Inserisci la passphrase\n"
+
+#: g10/passphrase.c:346
+msgid "Repeat passphrase\n"
+msgstr "Ripeti la passphrase\n"
+
+#: g10/passphrase.c:384
+msgid "passphrase too long\n"
+msgstr "passphrase troppo lunga\n"
+
+#: g10/passphrase.c:396
+msgid "invalid response from agent\n"
+msgstr "risposta non valida dall'agent\n"
+
+#: g10/passphrase.c:405
+msgid "cancelled by user\n"
+msgstr "interrotto dall'utente\n"
+
+#: g10/passphrase.c:408 g10/passphrase.c:477
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr "problema con l'agent: ha restituito 0x%lx\n"
+
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2701,25 +2774,20 @@
 "Ti serve una passphrase per sbloccare la chiave segreta\n"
 "dell'utente: \""
 
-#: g10/passphrase.c:168
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
 
-#: g10/passphrase.c:173
-#, c-format
-msgid " (main key ID %08lX)"
-msgstr " (key ID principale %08lX)"
-
-#: g10/passphrase.c:190
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
 msgstr "impossibile chiedere la password in modo batch\n"
 
-#: g10/passphrase.c:194
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr "Inserisci la passphrase: "
 
-#: g10/passphrase.c:198
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr "Ripeti la passphrase: "
 
@@ -2728,19 +2796,23 @@
 msgstr ""
 "i dati non sono stati salvati; usa l'opzione \"--output\" per salvarli\n"
 
-#: g10/plaintext.c:324
+#: g10/plaintext.c:332
 msgid "Detached signature.\n"
 msgstr "Firma separata.\n"
 
-#: g10/plaintext.c:328
+#: g10/plaintext.c:336
 msgid "Please enter name of data file: "
 msgstr "Inserisci il nome del file di dati: "
 
-#: g10/plaintext.c:349
+#: g10/plaintext.c:357
 msgid "reading stdin ...\n"
 msgstr "viene letto stdin...\n"
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:391
+msgid "no signed data\n"
+msgstr "non ci sono dati firmati\n"
+
+#: g10/plaintext.c:399
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossibile aprire i dati firmati `%s'\n"
@@ -2759,9 +2831,9 @@
 msgstr "la vecchia codifica del DEK non è gestita\n"
 
 #: g10/pubkey-enc.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
-msgstr "l'algoritmo di protezione %d non è gestito\n"
+msgstr "l'algoritmo di cifratura %d è sconosciuto o disabilitato\n"
 
 #: g10/pubkey-enc.c:192
 #, c-format
@@ -2770,53 +2842,47 @@
 "NOTA: l'algoritmo di cifratura %d non è stato trovato nelle impostazioni\n"
 
 #: g10/pubkey-enc.c:198
-#, fuzzy, c-format
+#, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
-msgstr "NOTA: chiave per firmare scaduta il %s\n"
+msgstr "NOTA: chiave %08lX scaduta il %s\n"
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
-msgstr ""
+msgstr "richiedo la chiave %08lX a %s ...\n"
 
-#: g10/hkp.c:85
-#, fuzzy, c-format
+#: g10/hkp.c:83
+#, c-format
 msgid "can't get key from keyserver: %s\n"
-msgstr "importa le chiavi da un key server"
+msgstr "impossibile scaricare la chiave dal keyserver: %s\n"
 
-#: g10/hkp.c:109 g10/hkp.c:148
+#: g10/hkp.c:102 g10/hkp.c:136
 msgid "no keyserver known (use option --keyserver)\n"
-msgstr ""
+msgstr "non conosco nessun keyserver (usa l'opzione --keyserver)\n"
 
-#: g10/hkp.c:117
-#, fuzzy, c-format
+#: g10/hkp.c:110
+#, c-format
 msgid "%s: not a valid key ID\n"
-msgstr "%s non è un set di caratteri valido\n"
-
-#: g10/hkp.c:170
-#, fuzzy, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "impossibile aprire `%s': %s\n"
+msgstr "%s: non è un key ID valido\n"
 
-#: g10/hkp.c:194
-#, fuzzy, c-format
+#: g10/hkp.c:191
+#, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:203
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
-msgstr ""
+msgstr "inviata con successo a `%s' (status=%u)\n"
 
-#: g10/hkp.c:209
+#: g10/hkp.c:206
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
-msgstr ""
+msgstr "invio a `%s' fallito: status=%u\n"
 
 #: g10/seckey-cert.c:53
-#, fuzzy
 msgid "secret key parts are not available\n"
-msgstr "la chiave segreta non è disponibile"
+msgstr "parti della chiave segreta non sono disponibili\n"
 
 #: g10/seckey-cert.c:59
 #, c-format
@@ -2853,31 +2919,36 @@
 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:324
+#: g10/sig-check.c:328
 #, c-format
-msgid "NOTE: signature key expired %s\n"
-msgstr "NOTA: chiave per firmare scaduta il %s\n"
+msgid "NOTE: signature key %08lX expired %s\n"
+msgstr "NOTA: chiave per firmare %08lX scaduta il %s\n"
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 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"
 
-#: g10/sign.c:140
+#: g10/sign.c:152
+#, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "controllo della firma creata fallito: %s\n"
+
+#: g10/sign.c:161
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "Firma %s da: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:307 g10/sign.c:630
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:405
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:431
+#: g10/sign.c:448
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENZIONE: `%s' è un file vuoto\n"
@@ -2916,7 +2987,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: la directory non esiste!\n"
 
-#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
+#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: impossibile creare: %s\n"
@@ -3064,9 +3135,9 @@
 msgstr "get_dir_record: search_record fallito: %s\n"
 
 #: g10/trustdb.c:474
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid long keyID\n"
-msgstr "%s non è un set di caratteri valido\n"
+msgstr "`%s' non è un key ID lungo valido\n"
 
 #: g10/trustdb.c:501
 #, c-format
@@ -3089,20 +3160,16 @@
 msgstr "chiave %08lX: accettata come chiave affidabile\n"
 
 #: g10/trustdb.c:546
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
-msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
+msgstr ""
+"chiave %08lX: manca la chiave pubblica della chiave fidata - ignorata\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"
@@ -3313,7 +3380,7 @@
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "ATTENZIONE: non è ancora possibile gestire record pref lunghi\n"
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -3323,7 +3390,7 @@
 "Ricorda che il file con la firma (.sig or .asc) deve\n"
 "essere il primo file indicato sulla riga di comando.\n"
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linea di input %u troppo lunga o LF mancante\n"
@@ -3333,41 +3400,50 @@
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: impossibile creare il portachiavi: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1374
+#: g10/ringedit.c:319 g10/ringedit.c:1376
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: portachiavi creato\n"
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1557
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATTENZIONE: esistono due file con informazioni confidenziali.\n"
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1558
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s è quello non modificato\n"
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1559
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s è quello nuovo\n"
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1560
 msgid "Please fix this possible security flaw\n"
 msgstr "Per favore risolvete questo possibile problema di sicurezza\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "la chiave non è indicata come insicura - impossibile usarla con il RNG "
 "finto!\n"
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "saltata `%s': doppia\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "saltata `%s': %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+msgid "skipped: secret key already present\n"
+msgstr "saltata: chiave pubblica già presente\n"
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3395,31 +3471,31 @@
 msgid "Enter new filename"
 msgstr "Inserire il nuovo nome del file"
 
-#: g10/openfile.c:182
+#: g10/openfile.c:184
 msgid "writing to stdout\n"
 msgstr "scrivo su stdout\n"
 
-#: g10/openfile.c:261
+#: g10/openfile.c:273
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "suppongo che i dati firmati siano in `%s'\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:323
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: creato un nuovo file delle opzioni\n"
 
-#: g10/openfile.c:338
+#: g10/openfile.c:350
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: impossibile creare la directory: %s\n"
 
-#: g10/openfile.c:341
+#: g10/openfile.c:353
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: directory creata\n"
 
-#: g10/openfile.c:343
+#: g10/openfile.c:355
 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"
@@ -3442,6 +3518,10 @@
 "ATTENZIONE: il messaggio era stato cifrato usando una chiave debole\n"
 "per il cifrario simmetrico\n"
 
+#: g10/encr-data.c:97
+msgid "problem handling encrypted packet\n"
+msgstr "problema nella gestione del pacchetto cifrato\n"
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "creata una chiave debole - riprovo\n"
@@ -3453,14 +3533,6 @@
 "Impossibile evitare una chiave debole per il cifrario simmetrico;\n"
 "ho provato %d volte!\n"
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "c'è una chiave segreta per questa chiave pubblica!\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr "prima usa l'opzione \"--delete-secret-key\" per cancellarla.\n"
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "impossibile fare questo in modo batch senza \"--yes\"\n"
@@ -3471,7 +3543,15 @@
 
 #: g10/delkey.c:144
 msgid "This is a secret key! - really delete? "
-msgstr "È una chaive segreta! - Vuoi cancellarla davvero? "
+msgstr "È una chiave segreta! - Vuoi cancellarla davvero? "
+
+#: g10/delkey.c:181
+msgid "there is a secret key for this public key!\n"
+msgstr "c'è una chiave segreta per questa chiave pubblica!\n"
+
+#: g10/delkey.c:183
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr "prima usa l'opzione \"--delete-secret-key\" per cancellarla.\n"
 
 #: g10/helptext.c:47
 msgid ""
@@ -3703,6 +3783,19 @@
 "      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"
 msgstr ""
+"Dovresti specificare un motivo per questa certificazione. A seconda del\n"
+"contesto hai la possibilità di scegliere tra questa lista:\n"
+"  \"Key has been compromised\"\n"
+"      Usa questo se hai un motivo per credere che una persona non "
+"autorizzata\n"
+"      abbia avuto accesso alla tua chiave segreta.\n"
+"  \"Key is superseded\"\n"
+"      Usa questo se hai sostituito questa chiave con una più recente.\n"
+"  \"Key is no longer used\"\n"
+"      Usa questo se hai mandato in pensione questa chiave.\n"
+"  \"User ID is no longer valid\"\n"
+"      Usa questo per affermare che l'user ID non dovrebbe più essere usato;\n"
+"      solitamente è usato per indicare un indirizzo di email non valido.\n"
 
 #: g10/helptext.c:245
 msgid ""
@@ -3710,6 +3803,9 @@
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
+"Se vuoi, puoi digitare un testo che descrive perché hai emesso\n"
+"questo certificato di revoca. Per favore sii conciso.\n"
+"Una riga vuota termina il testo.\n"
 
 #: g10/helptext.c:260
 msgid "No help available"
@@ -3719,32 +3815,3 @@
 #, 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"
-
-#~ msgid "enable full debugging"
-#~ msgstr "abilita il debugging completo"
-
-#~ msgid "do not write comment packets"
-#~ msgstr "non scrivere pacchetti di commento"
-
-#~ msgid "(default is 1)"
-#~ msgstr "(predefinito è 1)"
-
-#~ msgid "(default is 3)"
-#~ msgstr "(predefinito è 3)"
-
-#~ msgid "   (%d) ElGamal in a v3 packet\n"
-#~ msgstr "   (%d) ElGamal in un pacchetto v3\n"
-
-#~ msgid "Key generation can only be used in interactive mode\n"
-#~ msgstr "Una chiave può essere generata solo in modo interattivo\n"
diff -urN gnupg-1.0.4/po/ja.po gnupg-1.0.5/po/ja.po
--- gnupg-1.0.4/po/ja.po	Tue Oct 17 15:40:38 2000
+++ gnupg-1.0.5/po/ja.po	Sun Apr 29 16:39:27 2001
@@ -1,15 +1,15 @@
 # Japanese messages for GnuPG
-# Copyright (C) 1999 Free Software Foundation, Inc.
-# IIDA Yosiaki <iida@secom.ne.jp>, 1999-2000.
+# Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+# IIDA Yosiaki <y-iida@secom.co.jp>, 1999-2000.
 # Yoshihiro Kajiki <kajiki@ylug.org>, 1999.
 # Special thanks to "Takashi P.KATOH".
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-10-16 19:22+0200\n"
-"PO-Revision-Date: 2000-02-16 20:10+09:00\n"
-"Last-Translator: IIDA Yosiaki <iida@secom.ne.jp>\n"
+"Project-Id-Version: gnupg 1.0.4\n"
+"POT-Creation-Date: 2001-04-29 16:39+0200\n"
+"PO-Revision-Date: 2000-10-19 23:08+09:00\n"
+"Last-Translator: IIDA Yosiaki <y-iida@secom.co.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-JP\n"
@@ -17,37 +17,37 @@
 
 #: util/secmem.c:79
 msgid "Warning: using insecure memory!\n"
-msgstr "·Ù¹ð: °ÂÁ´¤Ç¤Ê¤¤¥á¥â¥ê¡¼¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤¹!\n"
+msgstr "·Ù¹ð: ¤ä¤Ð¤¤¥á¥â¥ê¡¼¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤¹!\n"
 
-#: util/secmem.c:295
+#: util/secmem.c:299
 msgid "operation is not possible without initialized secure memory\n"
-msgstr "½é´ü²½¤µ¤ì¤¿°ÂÁ´¤Ê¥á¥â¥ê¡¼¤¬Ìµ¤¤¾ì¹ç¤Ë¤Ï¼Â¹Ô¤Ç¤­¤Þ¤»¤ó\n"
+msgstr "½é´ü²½ºÑ¤ß¤Î°ÂÁ´¤Ê¥á¥â¥ê¡¼¤¬¤Ê¤¤¾ì¹ç¤Ë¤Ï¼Â¹Ô¤Ç¤­¤Þ¤»¤ó\n"
 
-#: util/secmem.c:296
+#: util/secmem.c:300
 msgid "(you may have used the wrong program for this task)\n"
-msgstr "(¤³¤ÎÌÜŪ¤Ë¤ÏÉÔŬÀÚ¤Ê¥×¥í¥°¥é¥à¤òÍѤ¤¤¿¤Î¤Ç¤·¤ç¤¦)\n"
+msgstr "(¤³¤ÎÌÜŪ¤Ë¤Ï¸í¤Ã¤¿¥×¥í¥°¥é¥à¤òÍѤ¤¤¿¤Î¤Ç¤·¤ç¤¦)\n"
 
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:287 util/miscutil.c:316
 msgid "yes"
 msgstr "yes"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:288 util/miscutil.c:319
 msgid "yY"
 msgstr "yY"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:289 util/miscutil.c:317
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:290 util/miscutil.c:320
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:318
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:321
 msgid "qQ"
 msgstr "qQ"
 
@@ -57,19 +57,19 @@
 
 #: util/errors.c:55
 msgid "unknown packet type"
-msgstr "¥Ñ¥±¥Ã¥È¥¿¥¤¥×¤¬ÉÔÌÀ¤Ç¤¹"
+msgstr "̤ÃΤΥѥ±¥Ã¥È¡¦¥¿¥¤¥×¤Ç¤¹"
 
 #: util/errors.c:56
 msgid "unknown version"
-msgstr "¥Ð¡¼¥¸¥ç¥ó¤¬ÉÔÌÀ¤Ç¤¹"
+msgstr "̤ÃΤΥС¼¥¸¥ç¥ó¤Ç¤¹"
 
 #: util/errors.c:57
 msgid "unknown pubkey algorithm"
-msgstr "¸ø³«¸°¤Î¥¢¥ë¥´¥ê¥º¥à¤¬ÉÔÌÀ¤Ç¤¹"
+msgstr "̤ÃΤθø³«¸°¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹"
 
 #: util/errors.c:58
 msgid "unknown digest algorithm"
-msgstr "Í×Ìó¤Î¥¢¥ë¥´¥ê¥º¥à¤¬ÉÔÌÀ¤Ç¤¹"
+msgstr "̤ÃΤÎÍ×Ì󥢥르¥ê¥º¥à¤Ç¤¹"
 
 #: util/errors.c:59
 msgid "bad public key"
@@ -85,23 +85,23 @@
 
 #: util/errors.c:62
 msgid "checksum error"
-msgstr "¥Á¥§¥Ã¥¯¥µ¥à¥¨¥é¡¼"
+msgstr "¥Á¥§¥Ã¥¯¥µ¥à¡¦¥¨¥é¡¼"
 
 #: util/errors.c:63
 msgid "bad passphrase"
-msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó"
+msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬ÉÔÀµ¤Ç¤¹"
 
 #: util/errors.c:64
 msgid "public key not found"
-msgstr "¸ø³«¸°¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "¸ø³«¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 #: util/errors.c:65
 msgid "unknown cipher algorithm"
-msgstr "°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤¬ÉÔÌÀ¤Ç¤¹"
+msgstr "̤ÃΤΰŹ楢¥ë¥´¥ê¥º¥à¤Ç¤¹"
 
 #: util/errors.c:66
 msgid "can't open the keyring"
-msgstr "¸°¥ê¥ó¥°¤¬³«¤±¤Þ¤»¤ó"
+msgstr "¸°Îؤ¬³«¤±¤Þ¤»¤ó"
 
 #: util/errors.c:67
 msgid "invalid packet"
@@ -109,19 +109,19 @@
 
 #: util/errors.c:68
 msgid "invalid armor"
-msgstr "̵¸ú¤ÊÁõ¹Ã¤Ç¤¹"
+msgstr "̵¸ú¤ÊÊñÁõ¤Ç¤¹"
 
 #: util/errors.c:69
 msgid "no such user id"
-msgstr "¤½¤Î¥æ¡¼¥¶ ID ¤Ï¤¢¤ê¤Þ¤»¤ó"
+msgstr "¤½¤Î¥æ¡¼¥¶¡¼ID¤Ï¤¢¤ê¤Þ¤»¤ó"
 
 #: util/errors.c:70
 msgid "secret key not available"
-msgstr "ÈëÌ©¸°¤¬¤¢¤ê¤Þ¤»¤ó"
+msgstr "ÈëÌ©¸°¤¬ÆÀ¤é¤ì¤Þ¤»¤ó"
 
 #: util/errors.c:71
 msgid "wrong secret key used"
-msgstr "ÉÔÀµ¤ÊÈëÌ©¸°¤¬ÍѤ¤¤é¤ì¤Æ¤¤¤Þ¤¹"
+msgstr "¸í¤Ã¤¿ÈëÌ©¸°¤¬ÍѤ¤¤é¤ì¤Æ¤¤¤Þ¤¹"
 
 #: util/errors.c:72
 msgid "not supported"
@@ -133,15 +133,15 @@
 
 #: util/errors.c:74
 msgid "file read error"
-msgstr "¥Õ¥¡¥¤¥ë¤ÎÆɤ߽Ф·¥¨¥é¡¼"
+msgstr "¥Õ¥¡¥¤¥ë¤ÎÆɽФ·¥¨¥é¡¼"
 
 #: util/errors.c:75
 msgid "file write error"
-msgstr "¥Õ¥¡¥¤¥ë¤Ø¤Î½ñ¤­¹þ¤ß¥¨¥é¡¼"
+msgstr "¥Õ¥¡¥¤¥ë¤Î½ñ¹þ¤ß¥¨¥é¡¼"
 
 #: util/errors.c:76
 msgid "unknown compress algorithm"
-msgstr "°µ½Ì¥¢¥ë¥´¥ê¥º¥à¤¬ÉÔÌÀ¤Ç¤¹"
+msgstr "̤ÃΤΰµ½Ì¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹"
 
 #: util/errors.c:77
 msgid "file open error"
@@ -149,23 +149,23 @@
 
 #: util/errors.c:78
 msgid "file create error"
-msgstr "¥Õ¥¡¥¤¥ë¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó"
+msgstr "¥Õ¥¡¥¤¥ë¤ÎºîÀ®¥¨¥é¡¼"
 
 #: util/errors.c:79
 msgid "invalid passphrase"
-msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
+msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬Ìµ¸ú¤Ç¤¹"
 
 #: util/errors.c:80
 msgid "unimplemented pubkey algorithm"
-msgstr "¸ø³«¸°¤Î¥¢¥ë¥´¥ê¥º¥à¤¬¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+msgstr "̤¼ÂÁõ¤Î¸ø³«¸°¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹"
 
 #: util/errors.c:81
 msgid "unimplemented cipher algorithm"
-msgstr "°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤¬¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+msgstr "̤¼ÂÁõ¤Î°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹"
 
 #: util/errors.c:82
 msgid "unknown signature class"
-msgstr "½ð̾¤Î¥¯¥é¥¹¤¬ÉÔÌÀ¤Ç¤¹"
+msgstr "̤ÃΤνð̾¥¯¥é¥¹¤Ç¤¹"
 
 #: util/errors.c:83
 msgid "trust database error"
@@ -173,7 +173,7 @@
 
 #: util/errors.c:84
 msgid "bad MPI"
-msgstr "MPI ¤¬ÉÔÀµ¤Ç¤¹"
+msgstr "ÉÔÀµ¤ÊMPI¤Ç¤¹"
 
 #: util/errors.c:85
 msgid "resource limit"
@@ -181,7 +181,7 @@
 
 #: util/errors.c:86
 msgid "invalid keyring"
-msgstr "¸°¥ê¥ó¥°¤¬Ìµ¸ú¤Ç¤¹"
+msgstr "¸°Îؤ¬Ìµ¸ú¤Ç¤¹"
 
 #: util/errors.c:87
 msgid "bad certificate"
@@ -189,7 +189,7 @@
 
 #: util/errors.c:88
 msgid "malformed user id"
-msgstr "¥æ¡¼¥¶ ID ¤Î½ñ¼°¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó"
+msgstr "¥æ¡¼¥¶¡¼ID¤Î½ñ¼°¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó"
 
 #: util/errors.c:89
 msgid "file close error"
@@ -197,15 +197,15 @@
 
 #: util/errors.c:90
 msgid "file rename error"
-msgstr "¥Õ¥¡¥¤¥ë̾¤ÎÊѹ¹¤¬¤Ç¤­¤Þ¤»¤ó"
+msgstr "¥Õ¥¡¥¤¥ë̾¤ÎÊѹ¹¥¨¥é¡¼"
 
 #: util/errors.c:91
 msgid "file delete error"
-msgstr "¥Õ¥¡¥¤¥ë¤Îºï½ü¤¬¤Ç¤­¤Þ¤»¤ó"
+msgstr "¥Õ¥¡¥¤¥ë¤Îºï½ü¥¨¥é¡¼"
 
 #: util/errors.c:92
 msgid "unexpected data"
-msgstr "ͽ´ü¤µ¤ì¤Æ¤¤¤Ê¤¤¥Ç¡¼¥¿¤Ç¤¹"
+msgstr "ͽ´ü¤»¤Ì¥Ç¡¼¥¿¤Ç¤¹"
 
 #: util/errors.c:93
 msgid "timestamp conflict"
@@ -229,15 +229,15 @@
 
 #: util/errors.c:98
 msgid "bad URI"
-msgstr "URI ¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
+msgstr "URI¤¬ÉÔÀµ¤Ç¤¹"
 
 #: util/errors.c:99
 msgid "unsupported URI"
-msgstr "¤½¤Î URI ¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó"
+msgstr "¤½¤ÎURI¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó"
 
 #: util/errors.c:100
 msgid "network error"
-msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¨¥é¡¼"
+msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¡¦¥¨¥é¡¼"
 
 #: util/errors.c:102
 msgid "not encrypted"
@@ -247,6 +247,17 @@
 msgid "not processed"
 msgstr "̤½èÍý"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "¸ø³«¸°¤¬ÉÔÀµ¤Ç¤¹"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "ÈëÌ©¸°¤¬ÉÔÀµ¤Ç¤¹"
+
 #: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -257,63 +268,63 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "¥Ð¥°¤ò¸«¤Ä¤±¤¿¤è¤¦¤Ç¤¹ ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
 #, c-format
 msgid "can't open `%s': %s\n"
-msgstr "`%s' ¤¬³«¤±¤Þ¤»¤ó: %s\n"
+msgstr "`%s'¤¬³«¤±¤Þ¤»¤ó: %s\n"
 
-#: cipher/random.c:315
-#, fuzzy, c-format
+#: cipher/random.c:324
+#, c-format
 msgid "can't stat `%s': %s\n"
-msgstr "`%s' ¤¬³«¤±¤Þ¤»¤ó: %s\n"
+msgstr "`%s'¤òÄ´¤Ù¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:329
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
-msgstr ""
+msgstr "`%s' ¤ÏÉáÄ̤Υե¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó - ̵»ë\n"
 
-#: cipher/random.c:325
+#: cipher/random.c:334
 msgid "note: random_seed file is empty\n"
-msgstr ""
+msgstr "Ãí°Õ: random_seed ¥Õ¥¡¥¤¥ë¤Ï¶õ¤Ç¤¹\n"
 
-#: cipher/random.c:331
+#: cipher/random.c:340
 msgid "warning: invalid size of random_seed file - not used\n"
-msgstr ""
+msgstr "·Ù¹ð: ̵¸ú¤Ê¥µ¥¤¥º¤Î random_seed ¥Õ¥¡¥¤¥ë - »È¤¤¤Þ¤»¤ó\n"
 
-#: cipher/random.c:339
-#, fuzzy, c-format
+#: cipher/random.c:348
+#, c-format
 msgid "can't read `%s': %s\n"
-msgstr "`%s' ¤¬³«¤±¤Þ¤»¤ó: %s\n"
+msgstr "`%s'¤òÆɤá¤Þ¤»¤ó: %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:386
 msgid "note: random_seed file not updated\n"
-msgstr ""
+msgstr "Ãí°Õ: random_seed ¥Õ¥¡¥¤¥ë¤Î¹¹¿·¤ò¤·¤Þ¤»¤ó\n"
 
-#: cipher/random.c:397
-#, fuzzy, c-format
+#: cipher/random.c:406
+#, c-format
 msgid "can't create `%s': %s\n"
-msgstr "%s ¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n"
+msgstr "`%s'¤¬¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: cipher/random.c:404
-#, fuzzy, c-format
+#: cipher/random.c:413
+#, c-format
 msgid "can't write `%s': %s\n"
-msgstr "`%s' ¤¬³«¤±¤Þ¤»¤ó: %s\n"
+msgstr "`%s'¤Ë½ñ¤±¤Þ¤»¤ó: %s\n"
 
-#: cipher/random.c:407
-#, fuzzy, c-format
+#: cipher/random.c:416
+#, c-format
 msgid "can't close `%s': %s\n"
-msgstr "`%s' ¤¬³«¤±¤Þ¤»¤ó: %s\n"
+msgstr "`%s'¤òÊĤ¸¤é¤ì¤Þ¤»¤ó: %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:427
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
-msgstr ""
+msgstr "¥é¥ó¥À¥à¡¦¥Ó¥Ã¥È¤ò¤¿¤¯¤µ¤óÍ׵ᤷ²á¤®¤Ç¤¹¡£¸Â³¦¤Ï %d\n"
 
-#: cipher/random.c:650
+#: cipher/random.c:661
 msgid "WARNING: using insecure random number generator!!\n"
-msgstr "·Ù¹ð: °ÂÁ´¤Ç¤Ê¤¤Íð¿ôÀ¸À®ÁõÃÖ¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹!!\n"
+msgstr "·Ù¹ð: ¤ä¤Ð¤¤Íð¿ôÀ¸À®»Ò¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹!!\n"
 
-#: cipher/random.c:651
+#: cipher/random.c:662
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -321,10 +332,10 @@
 "DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
 "\n"
 msgstr ""
-"¤³¤Î OS ¤ËÅëºÜ¤µ¤ì¤Æ¤¤¤ëµ¿»÷Íð¿ôÀ¸À®¥¢¥ë¥´¥ê¥º¥à¤Ï¡¢\n"
-"°Å¹æÍѤȤ·¤Æ¤ÏÉÔŬÅö¤Ç¤¹¡£¶¯¸Ç¤ÊÍð¿ô¤òÀ¸À®¤Ç¤­¤Þ¤»¤ó¡£\n"
+"ÅëºÜ¤µ¤ì¤Æ¤¤¤ëÍð¿ôÀ¸À®»Ò¤Ï¡¢°Å¹æÍѤȤ·¤Æ¤Ï¤ª¤½¤Þ¤Ä¤Ç¡¢\n"
+"¶¯¤¤Íð¿ô¤¬¤Ç¤­¤Þ¤»¤ó!\n"
 "\n"
-"¤³¤Î¥×¥í¥°¥é¥à¤Ë¤è¤êÀ¸À®¤µ¤ì¤¿¥Ç¡¼¥¿¤Ï°ìÀÚ»ÈÍѤ·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó!!\n"
+"¤³¤Î¥×¥í¥°¥é¥à¤ÎÀ¸À®¤·¤¿¥Ç¡¼¥¿¤ò°ìÀÚ»ÈÍѤ·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó!!\n"
 "\n"
 
 #: cipher/rndlinux.c:142
@@ -335,10 +346,10 @@
 "the OS a chance to collect more entropy! (Need %d more bytes)\n"
 msgstr ""
 "\n"
-"½½Ê¬¤ÊŤµ¤ÎÍð¿ô¤¬ÆÀ¤é¤ì¤Þ¤»¤ó¡£¥¨¥ó¥È¥í¥Ô¡¼¤òÁý²Ã¤µ¤»¤ë¤è¤¦¤Ë\n"
-"OS ¤ÎÀßÄê¤òÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£(%d bytes °Ê¾å¤Î¼þ´ü¤¬É¬ÍפǤ¹)\n"
+"½½Ê¬¤ÊŤµ¤ÎÍð¿ô¤¬ÆÀ¤é¤ì¤Þ¤»¤ó¡£OS¤¬¤â¤Ã¤ÈÍ𻨤µ¤ò¼ý½¸\n"
+"¤Ç¤­¤ë¤è¤¦¡¢²¿¤«¤·¤Æ¤¯¤À¤µ¤¤! (¤¢¤È%d¥Ð¥¤¥È¤¤¤ê¤Þ¤¹)\n"
 
-#: g10/g10.c:206
+#: g10/g10.c:216
 msgid ""
 "@Commands:\n"
 " "
@@ -346,139 +357,141 @@
 "@¥³¥Þ¥ó¥É:\n"
 " "
 
-#: g10/g10.c:208
+#: g10/g10.c:218
 msgid "|[file]|make a signature"
-msgstr "|[file]|½ð̾¤òºîÀ®"
+msgstr "|[¥Õ¥¡¥¤¥ë]|½ð̾¤òºîÀ®"
 
-#: g10/g10.c:209
+#: g10/g10.c:219
 msgid "|[file]|make a clear text signature"
-msgstr "|[file]|¥¯¥ê¥¢½ð̾¤òºîÀ®"
+msgstr "|[¥Õ¥¡¥¤¥ë]|¥¯¥ê¥¢½ð̾¤òºîÀ®"
 
-#: g10/g10.c:210
+#: g10/g10.c:220
 msgid "make a detached signature"
 msgstr "ʬΥ½ð̾¤òºîÀ®"
 
-#: g10/g10.c:211
+#: g10/g10.c:221
 msgid "encrypt data"
 msgstr "¥Ç¡¼¥¿¤ò°Å¹æ²½"
 
-#: g10/g10.c:212
+#: g10/g10.c:222
 msgid "encryption only with symmetric cipher"
 msgstr "°Å¹æ²½¤Ë¤ÏÂоΰŹæË¡¤Î¤ß¤ò»ÈÍÑ"
 
-#: g10/g10.c:213
+#: g10/g10.c:223
 msgid "store only"
 msgstr "Êݸ¤Î¤ß"
 
-#: g10/g10.c:214
+#: g10/g10.c:224
 msgid "decrypt data (default)"
-msgstr "¥Ç¡¼¥¿¤òÉü¹æ (¥Ç¥Õ¥©¥ë¥È)"
+msgstr "¥Ç¡¼¥¿¤òÉü¹æ (´ûÄê)"
 
-#: g10/g10.c:215
+#: g10/g10.c:225
 msgid "verify a signature"
 msgstr "½ð̾¤ò¸¡¾Ú"
 
-#: g10/g10.c:217
+#: g10/g10.c:227
 msgid "list keys"
 msgstr "¸°¤Î°ìÍ÷"
 
-#: g10/g10.c:219
+#: g10/g10.c:229
 msgid "list keys and signatures"
 msgstr "¸°¤È½ð̾¤Î°ìÍ÷"
 
-#: g10/g10.c:220
+#: g10/g10.c:230
 msgid "check key signatures"
 msgstr "¸°¤Î½ð̾¤ò¸¡¾Ú"
 
-#: g10/g10.c:221
+#: g10/g10.c:231
 msgid "list keys and fingerprints"
 msgstr "¸°¤È»ØÌæ¤Î°ìÍ÷"
 
-#: g10/g10.c:222
+#: g10/g10.c:232
 msgid "list secret keys"
 msgstr "ÈëÌ©¸°¤Î°ìÍ÷"
 
-#: g10/g10.c:223
+#: g10/g10.c:233
 msgid "generate a new key pair"
-msgstr "¿·¤·¤¤¸°¥Ú¥¢¤òºîÀ®"
+msgstr "¿·¤·¤¤¸°ÂФòÀ¸À®"
 
-#: g10/g10.c:224
+#: g10/g10.c:234
 msgid "remove key from the public keyring"
-msgstr "¸ø³«¸°¥ê¥ó¥°¤«¤é¸°¤òºï½ü"
+msgstr "¸ø³«¸°Îؤ«¤é¸°¤òºï½ü"
 
-#: g10/g10.c:226
+#: g10/g10.c:236
 msgid "remove key from the secret keyring"
-msgstr "ÈëÌ©¸°¥ê¥ó¥°¤«¤é¸°¤òºï½ü"
+msgstr "ÈëÌ©¸°Îؤ«¤é¸°¤òºï½ü"
 
-#: g10/g10.c:227
+#: g10/g10.c:237
 msgid "sign a key"
 msgstr "¸°¤Ë½ð̾"
 
-#: g10/g10.c:228
+#: g10/g10.c:238
 msgid "sign a key locally"
-msgstr "¥í¡¼¥«¥ë¤Ë¤Æ¸°¤Ë½ð̾"
+msgstr "¸°¤ØÆâÉôŪ¤Ë½ð̾"
 
-#: g10/g10.c:229
+#: g10/g10.c:239
 msgid "sign or edit a key"
-msgstr "¸°¤Ø¤Î½ð̾¤Þ¤¿¤ÏÊÔ½¸"
+msgstr "¸°¤Ø¤Î½ð̾¤äÊÔ½¸"
 
-#: g10/g10.c:230
+#: g10/g10.c:240
 msgid "generate a revocation certificate"
-msgstr "ÇË´þ¾ÚÌÀ½ñ¤òºîÀ®"
+msgstr "ÇË´þ¾ÚÌÀ½ñ¤òÀ¸À®"
 
-#: g10/g10.c:231
+#: g10/g10.c:241
 msgid "export keys"
 msgstr "¸°¤ò½ñ¤­½Ð¤¹"
 
-#: g10/g10.c:232
+#: g10/g10.c:242
 msgid "export keys to a key server"
-msgstr "¸°¥µ¡¼¥Ð¤Ë¸°¤òÅÐÏ¿"
+msgstr "¸°¥µ¡¼¥Ð¡¼¤Ë¸°¤ò½ñ¤­½Ð¤¹"
 
-#: g10/g10.c:233
+#: g10/g10.c:243
 msgid "import keys from a key server"
 msgstr "¸°¥µ¡¼¥Ð¡¼¤«¤é¸°¤òÆɤ߹þ¤à"
 
-#: g10/g10.c:237
+#: g10/g10.c:247
 msgid "import/merge keys"
-msgstr "¸°¤ÎÆɤ߹þ¤ß/¥Þ¡¼¥¸"
+msgstr "¸°¤ÎÆɹþ¤ß/Ê»¹ç"
 
-#: g10/g10.c:239
+#: g10/g10.c:249
 msgid "list only the sequence of packets"
 msgstr "¥Ñ¥±¥Ã¥ÈÎó¤Î¤ß¤Î°ìÍ÷"
 
-#: g10/g10.c:241
+#: g10/g10.c:251
 msgid "export the ownertrust values"
 msgstr "½êÍ­¼Ô¤ò¿®ÍѤ·¤¿Ãͤò½ñ¤­½Ð¤¹"
 
-#: g10/g10.c:243
+#: g10/g10.c:253
 msgid "import ownertrust values"
 msgstr "½êÍ­¼Ô¤ò¿®ÍѤ·¤¿ÃͤòÆɤ߹þ¤à"
 
-#: g10/g10.c:245
+#: g10/g10.c:255
 msgid "update the trust database"
 msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ò¹¹¿·"
 
-#: g10/g10.c:247
+#: g10/g10.c:257
 msgid "|[NAMES]|check the trust database"
-msgstr "|[NAMES]|¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ò¥Á¥§¥Ã¥¯"
+msgstr "|[̾Á°]|¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ò¥Á¥§¥Ã¥¯"
 
-#: g10/g10.c:248
+#: g10/g10.c:258
 msgid "fix a corrupted trust database"
 msgstr "²õ¤ì¤¿¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ò½¤Éü"
 
-#: g10/g10.c:249
+#: g10/g10.c:259
 msgid "De-Armor a file or stdin"
-msgstr "¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ïɸ½àÆþÎϤÎÁõ¹Ã½üµî"
+msgstr ""
+"¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ïɸ½àÆþÎϤÎ\n"
+"ÊñÁõ½üµî"
 
-#: g10/g10.c:251
+#: g10/g10.c:261
 msgid "En-Armor a file or stdin"
-msgstr "¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ïɸ½àÆþÎϤÎÁõ¹Ã²½"
+msgstr "¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ïɸ½àÆþÎϤÎÊñÁõ²½"
 
-#: g10/g10.c:253
+#: g10/g10.c:263
 msgid "|algo [files]|print message digests"
-msgstr "|algo [files]|¥á¥Ã¥»¡¼¥¸Í×Ìó¤ò½ÐÎÏ"
+msgstr "|¥¢¥ë¥´¥ê¥º¥à [¥Õ¥¡¥¤¥ë]|¥á¥Ã¥»¡¼¥¸Í×Ìó¤ò½ÐÎÏ"
 
-#: g10/g10.c:257
+#: g10/g10.c:267
 msgid ""
 "@\n"
 "Options:\n"
@@ -488,158 +501,201 @@
 "¥ª¥×¥·¥ç¥ó:\n"
 " "
 
-#: g10/g10.c:259
+#: g10/g10.c:269
 msgid "create ascii armored output"
-msgstr "¥¢¥¹¥­¡¼·Á¼°¤ÎÁõ¹Ã¤òÀ¸À®"
+msgstr "ASCII·Á¼°¤ÎÊñÁõ¤òºîÀ®"
 
-#: g10/g10.c:261
+#: g10/g10.c:271
 msgid "|NAME|encrypt for NAME"
-msgstr "|NAME|NAME ÍѤ˰Ź沽"
+msgstr "|̾Á°|¡Ö̾Á°¡×ÍѤ˰Ź沽"
 
-#: g10/g10.c:264
+#: g10/g10.c:274
 msgid "|NAME|use NAME as default recipient"
-msgstr "|NAME|¥Ç¥Õ¥©¥ë¥È¤Î¼õ¿®¼Ô¤È¤·¤Æ NAME ¤òÍѤ¤¤ë"
+msgstr ""
+"|̾Á°|´ûÄê¤Î¼õ¿®¼Ô¤È¤·¤Æ\n"
+"¡Ö̾Á°¡×¤ò»ÈÍÑ"
 
-#: g10/g10.c:266
+#: g10/g10.c:276
 msgid "use the default key as default recipient"
-msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¼õ¿®¼Ô¤È¤·¤Æ¥Ç¥Õ¥©¥ë¥È¤Î¸°¤òÍѤ¤¤ë"
+msgstr "´ûÄê¤Î¼õ¿®¼Ô¤Ë´ûÄê¤Î¸°¤ò»ÈÍÑ"
 
-#: g10/g10.c:270
+#: g10/g10.c:280
 msgid "use this user-id to sign or decrypt"
-msgstr "½ð̾¤äÉü¹æ¤Ë ¤³¤Î user-id ¤òÍѤ¤¤ë"
+msgstr ""
+"½ð̾¤äÉü¹æ¤Ë¤³¤Î¥æ¡¼¥¶¡¼id\n"
+"¤ò»ÈÍÑ"
 
-#: g10/g10.c:271
+#: g10/g10.c:281
 msgid "|N|set compress level N (0 disables)"
-msgstr "|N|°µ½Ì¥ì¥Ù¥ë¤ò N ¤ËÀßÄꤹ¤ë (0 ¤ÏÈó°µ½Ì)"
+msgstr ""
+"|N|°µ½Ì¥ì¥Ù¥ë¤òN¤ËÀßÄê\n"
+"(0¤ÏÈó°µ½Ì)"
 
-#: g10/g10.c:273
+#: g10/g10.c:283
 msgid "use canonical text mode"
-msgstr "ɸ½à¥Æ¥­¥¹¥È¥â¡¼¥É¤òÍѤ¤¤ë"
+msgstr "Àµ½à¥Æ¥­¥¹¥È¡¦¥â¡¼¥É¤ò»ÈÍÑ"
 
-#: g10/g10.c:274
+#: g10/g10.c:284
 msgid "use as output file"
-msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë¤È¤·¤ÆÍѤ¤¤ë"
+msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë¤È¤·¤Æ»ÈÍÑ"
 
-#: g10/g10.c:275
+#: g10/g10.c:285
 msgid "verbose"
 msgstr "¾éĹ"
 
-#: g10/g10.c:276
+#: g10/g10.c:286
 msgid "be somewhat more quiet"
 msgstr "¤ä¤äÀŤ«"
 
-#: g10/g10.c:277
+#: g10/g10.c:287
 msgid "don't use the terminal at all"
-msgstr "üËö¤ò»ÈÍѤ·¤Ê¤¤"
+msgstr "üËö¤òÉÔ»ÈÍÑ"
 
-#: g10/g10.c:278
+#: g10/g10.c:288
 msgid "force v3 signatures"
-msgstr "¶¯À©Åª¤Ë v3 ½ð̾¤¹¤ë"
+msgstr "¶¯À©Åª¤Ëv3½ð̾"
 
-#: g10/g10.c:279
+#: g10/g10.c:289
 msgid "always use a MDC for encryption"
-msgstr "°Å¹æ²½¤Ë¤Ï¾ï¤Ë MDC ¤ò»ÈÍÑ"
+msgstr "°Å¹æ²½¤Ë¤Ï¾ï¤ËMDC¤ò»ÈÍÑ"
 
-#: g10/g10.c:280
+#: g10/g10.c:290
 msgid "do not make any changes"
-msgstr "Á´¤Æ¤ÎÊѹ¹¤òÍѤ¤¤Ê¤¤"
+msgstr "̵Êѹ¹"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:282
+#: g10/g10.c:292
+msgid "use the gpg-agent"
+msgstr ""
+
+#: g10/g10.c:293
 msgid "batch mode: never ask"
-msgstr "¥Ð¥Ã¥Á¥â¡¼¥É: Ì䤤¹ç¤ï¤»¤ò¹Ô¤ï¤Ê¤¤"
+msgstr "¥Ð¥Ã¥Á¡¦¥â¡¼¥É: ³Îǧ¾Êά"
 
-#: g10/g10.c:283
+#: g10/g10.c:294
 msgid "assume yes on most questions"
-msgstr "Á´¤Æ¤Î¼ÁÌä¤Ë yes ¤È¸«¤Ê¤¹"
+msgstr ""
+"¤¿¤¤¤Æ¤¤¤Î¼ÁÌä¤ÎÅú¤¨¤Ïyes\n"
+"¤È¤ß¤Ê¤¹"
 
-#: g10/g10.c:284
+#: g10/g10.c:295
 msgid "assume no on most questions"
-msgstr "Á´¤Æ¤Î¼ÁÌä¤Ë no ¤È¸«¤Ê¤¹"
+msgstr ""
+"¤¿¤¤¤Æ¤¤¤Î¼ÁÌä¤ÎÅú¤¨¤Ïno\n"
+"¤È¤ß¤Ê¤¹"
 
-#: g10/g10.c:285
+#: g10/g10.c:296
 msgid "add this keyring to the list of keyrings"
-msgstr "¸°¥ê¥ó¥°¤Î°ìÍ÷¤Ë ¤³¤Î¸°¤ò²Ã¤¨¤ë"
+msgstr "¸°ÎؤΰìÍ÷¤Ë¤³¤Î¸°ÎؤòÄɲÃ"
 
-#: g10/g10.c:286
+#: g10/g10.c:297
 msgid "add this secret keyring to the list"
-msgstr "°ìÍ÷¤Ë ¤³¤ÎÈëÌ©¸°¥ê¥ó¥°¤ò²Ã¤¨¤ë"
+msgstr "°ìÍ÷¤Ë¤³¤ÎÈëÌ©¸°ÎؤòÄɲÃ"
 
-#: g10/g10.c:287
+#: g10/g10.c:298
 msgid "|NAME|use NAME as default secret key"
-msgstr "|NAME|¥Ç¥Õ¥©¥ë¥È¤ÎÈëÌ©¸°¤È¤·¤Æ NAME ¤òÍѤ¤¤ë"
+msgstr ""
+"|̾Á°|´ûÄê¤ÎÈëÌ©¸°¤È¤·¤Æ\n"
+"¡Ö̾Á°¡×¤ò»ÈÍÑ"
 
-#: g10/g10.c:288
+#: g10/g10.c:299
 msgid "|HOST|use this keyserver to lookup keys"
-msgstr "|HOST|¸°¤Î¸¡º÷¤Ë ¤³¤Î¸°¥µ¡¼¥Ð¤òÍѤ¤¤ë"
+msgstr "|¥Û¥¹¥È|¸°¤Î¸¡º÷¤Ë¤³¤Î¸°¥µ¡¼¥Ð¡¼¤ò»ÈÍÑ"
 
-#: g10/g10.c:289
+#: g10/g10.c:300
 msgid "|NAME|set terminal charset to NAME"
-msgstr "|NAME|üËö¤Îʸ»ú¥³¡¼¥É¤ò NAME ¤ËÀßÄꤹ¤ë"
+msgstr ""
+"|CHARSET̾|üËö¤Îcharset¤ò¡ÖCHARSET̾¡×\n"
+"¤ËÀßÄê"
 
-#: g10/g10.c:290
+#: g10/g10.c:301
 msgid "read options from file"
-msgstr "¥Õ¥¡¥¤¥ë¤«¤é¥ª¥×¥·¥ç¥ó¤òÆɤ߹þ¤à"
+msgstr ""
+"¥Õ¥¡¥¤¥ë¤«¤é¥ª¥×¥·¥ç¥ó¤ò\n"
+"Æɤ߹þ¤à"
 
-#: g10/g10.c:294
+#: g10/g10.c:305
 msgid "|FD|write status info to this FD"
-msgstr "|FD|¤³¤Î FD ¤Ë¾õÂÖ¤ò½ñ¤­½Ð¤¹"
+msgstr ""
+"|¥Õ¥¡¥¤¥ëµ­½Ò»Ò|¤³¤Î¥Õ¥¡¥¤¥ëµ­½Ò»Ò¤Ë¾õÂÖ¤ò\n"
+"½ñ¤­½Ð¤¹"
 
-#: g10/g10.c:299
+#: g10/g10.c:310
 msgid "|KEYID|ulimately trust this key"
-msgstr ""
+msgstr "|¸°ID|¤³¤Î¡Ö¸°¡×¤òµæ¶ËŪ¤Ë¿®ÍѤ¹¤ë"
 
-#: g10/g10.c:300
+#: g10/g10.c:311
 msgid "|FILE|load extension module FILE"
-msgstr "|FILE|³ÈÄ¥¥â¥¸¥å¡¼¥ë FILE ¤òÆɤߤ³¤à"
+msgstr ""
+"|¥Õ¥¡¥¤¥ë|³ÈÄ¥¥â¥¸¥å¡¼¥ë¤Î¥Õ¥¡¥¤¥ë¤ò\n"
+"Æɤ߹þ¤à"
 
-#: g10/g10.c:301
+#: g10/g10.c:312
 msgid "emulate the mode described in RFC1991"
-msgstr "RFC1991 ¤Ëµ­½Ò¤µ¤ì¤¿¥â¡¼¥É¤òÍѤ¤¤ë"
+msgstr ""
+"RFC1991¤Ëµ­½Ò¤µ¤ì¤¿¥â¡¼¥É¤ò\n"
+"»ÈÍÑ"
 
-#: g10/g10.c:302
+#: g10/g10.c:313
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
-msgstr "Á´¤Æ¤Î¥Ñ¥±¥Ã¥È¤È°Å¹æ¤È½ð̾¤Î¥ª¥×¥·¥ç¥ó¤ò OpenPGP ¤Î¿¶Éñ¤ËÀßÄê"
+msgstr ""
+"¥Ñ¥±¥Ã¥È¤È°Å¹æ¤È½ð̾¤Î¥ª¥×¥·¥ç\n"
+"¥ó¤òÁ´¤ÆOpenPGP¤Î¿¶Éñ¤ËÀßÄê"
 
-#: g10/g10.c:303
+#: g10/g10.c:314
 msgid "|N|use passphrase mode N"
-msgstr "|N|¥Ñ¥¹¥Õ¥ì¡¼¥º¥â¡¼¥É N ¤òÍѤ¤¤ë"
+msgstr "|N|¥Ñ¥¹¥Õ¥ì¡¼¥º¡¦¥â¡¼¥ÉN¤ò»ÈÍÑ"
 
-#: g10/g10.c:305
+#: g10/g10.c:316
 msgid "|NAME|use message digest algorithm NAME for passphrases"
-msgstr "|NAME|¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ë¥á¥Ã¥»¡¼¥¸Í×Ì󥢥르¥ê¥º¥à NAME ¤òÍѤ¤¤ë"
+msgstr ""
+"|̾Á°|¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ë¡Ö̾Á°¡×¤Î¥á¥Ã\n"
+"¥»¡¼¥¸Í×Ì󥢥르¥ê¥º¥à¤ò»ÈÍÑ"
 
-#: g10/g10.c:307
+#: g10/g10.c:318
 msgid "|NAME|use cipher algorithm NAME for passphrases"
-msgstr "|NAME|¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ë°Å¹æ¥¢¥ë¥´¥ê¥º¥à NAME ¤òÍѤ¤¤ë"
+msgstr ""
+"|̾Á°|¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ë¡Ö̾Á°¡×¤Î°Å¹æ\n"
+"¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍÑ"
 
-#: g10/g10.c:308
+#: g10/g10.c:319
 msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NAME|°Å¹æ¥¢¥ë¥´¥ê¥º¥à NAME ¤òÍѤ¤¤ë"
+msgstr ""
+"|̾Á°|¡Ö̾Á°¡×¤Î°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤ò\n"
+"»ÈÍÑ"
 
-#: g10/g10.c:309
+#: g10/g10.c:320
 msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NAME|¥á¥Ã¥»¡¼¥¸Í×Ì󥢥르¥ê¥º¥à NAME ¤òÍѤ¤¤ë"
+msgstr ""
+"|̾Á°|¡Ö̾Á°¡×¤Î¥á¥Ã¥»¡¼¥¸Í×Ìó\n"
+"¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍÑ"
 
-#: g10/g10.c:310
+#: g10/g10.c:321
 msgid "|N|use compress algorithm N"
-msgstr "|NAME|°µ½Ì¥¢¥ë¥´¥ê¥º¥à NAME ¤òÍѤ¤¤ë"
+msgstr ""
+"|̾Á°|¡Ö̾Á°¡×¤Î°µ½Ì¥¢¥ë¥´¥ê¥º¥à¤ò\n"
+"»ÈÍÑ"
 
-#: g10/g10.c:311
+#: g10/g10.c:322
 msgid "throw keyid field of encrypted packets"
-msgstr "°Å¹æ¥Ñ¥±¥Ã¥È¤Î¸° ID ¥Õ¥£¡¼¥ë¥É¤òÁ÷½Ð¤¹¤ë"
+msgstr ""
+"°Å¹æ¥Ñ¥±¥Ã¥È¤Î¸°ID¥Õ¥£¡¼¥ë¥É\n"
+"¤òÁ÷½Ð"
 
-#: g10/g10.c:312
+#: g10/g10.c:323
 msgid "|NAME=VALUE|use this notation data"
-msgstr "|NAME=VALUE|¤³¤ÎÃí¼á¥Ç¡¼¥¿¤òÍѤ¤¤ë"
+msgstr "|̾Á°=ÃÍ|¤³¤ÎÃí¼á¥Ç¡¼¥¿¤ò»ÈÍÑ"
 
-#: g10/g10.c:315
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
+"@\n"
+"(¥³¥Þ¥ó¥É¤È¥ª¥×¥·¥ç¥óÁ´Éô¤Î°ìÍ÷¤Ï¡¢\n"
+"¥Þ¥Ë¥å¥¢¥ë¡¦¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤)\n"
 
-#: g10/g10.c:318
+#: g10/g10.c:329
 msgid ""
 "@\n"
 "Examples:\n"
@@ -653,31 +709,31 @@
 "@\n"
 "Îã:\n"
 "\n"
-" -se -r Bob [file]          ¥æ¡¼¥¶ Bob ¤Ø¤Î½ð̾¤È°Å¹æ²½\n"
-" --clearsign [file]         ¥¯¥ê¥¢½ð̾¤òÀ¸À®\n"
-" --detach-sign [file]       ʬΥ½ð̾¤òÀ¸À®\n"
-" --list-keys [names]        ¸°¤òɽ¼¨\n"
-" --fingerprint [names]      »ØÌæ¤òɽ¼¨\n"
+" -se -r Bob [¥Õ¥¡¥¤¥ë]      ¥æ¡¼¥¶¡¼Bob¤Ø¤Î½ð̾¤È°Å¹æ²½\n"
+" --clearsign [¥Õ¥¡¥¤¥ë]     ¥¯¥ê¥¢½ð̾¤òÀ¸À®\n"
+" --detach-sign [¥Õ¥¡¥¤¥ë]   ʬΥ½ð̾¤òÀ¸À®\n"
+" --list-keys [̾Á°]         ¸°¤òɽ¼¨\n"
+" --fingerprint [̾Á°]       »ØÌæ¤òɽ¼¨\n"
 
-#: g10/g10.c:418
+#: g10/g10.c:438
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
-msgstr "¥Ð¥°¤ò¸«¤Ä¤±¤¿¤é <gnupg-bugs@gnu.org> ¤Þ¤Ç¥ì¥Ý¡¼¥È¤òÁ÷¤Ã¤Æ²¼¤µ¤¤¡£\n"
+msgstr "¥Ð¥°¤ò¸«¤Ä¤±¤¿¤é <gnupg-bugs@gnu.org> ¤Þ¤Ç¤´Êó¹ð¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/g10.c:422
+#: g10/g10.c:442
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "»È¤¤Êý: gpg [¥ª¥×¥·¥ç¥ó] [¥Õ¥¡¥¤¥ë] (¥Ø¥ë¥×¤Ï -h)"
 
-#: g10/g10.c:425
+#: g10/g10.c:445
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
 "default operation depends on the input data\n"
 msgstr ""
-"½ñ¼°: gpg [options] [files]\n"
-"½ð̾¡¢¸¡¾Ú¡¢°Å¹æ²½¡¢¤Þ¤¿¤Ï Éü¹æ\n"
-"¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤ÏÆþÎϥǡ¼¥¿¤Ë°Í¸\n"
+"½ñ¼°: gpg [¥ª¥×¥·¥ç¥ó] [¥Õ¥¡¥¤¥ë]\n"
+"½ð̾¡¢¸¡¾Ú¡¢°Å¹æ²½¤äÉü¹æ\n"
+"´ûÄê¤ÎÆ°ºî¤Ï¡¢ÆþÎϥǡ¼¥¿¤Ë°Í¸\n"
 
-#: g10/g10.c:432
+#: g10/g10.c:452
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -685,285 +741,290 @@
 "\n"
 "¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¥¢¥ë¥´¥ê¥º¥à:\n"
 
-#: g10/g10.c:511
+#: g10/g10.c:531
 msgid "usage: gpg [options] "
-msgstr "»È¤¤Êý: gpg [options] "
+msgstr "»È¤¤Êý: gpg [¥ª¥×¥·¥ç¥ó] "
 
-#: g10/g10.c:564
+#: g10/g10.c:584
 msgid "conflicting commands\n"
 msgstr "¥³¥Þ¥ó¥É¤Î¾×ÆÍ\n"
 
-#: g10/g10.c:704
+#: g10/g10.c:734
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
-msgstr "Ãí°Õ: ¥Ç¥Õ¥©¥ë¥È¥ª¥×¥·¥ç¥ó¥Õ¥¡¥¤¥ë `%s' ¤¬¤¢¤ê¤Þ¤»¤ó\n"
+msgstr "Ãí°Õ: ´ûÄê¤Î¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë`%s'¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:708
+#: g10/g10.c:738
 #, c-format
 msgid "option file `%s': %s\n"
-msgstr "¥ª¥×¥·¥ç¥ó¥Õ¥¡¥¤¥ë `%s': %s\n"
+msgstr "¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë`%s': %s\n"
 
-#: g10/g10.c:715
+#: g10/g10.c:745
 #, c-format
 msgid "reading options from `%s'\n"
-msgstr "`%s' ¤«¤é¥ª¥×¥·¥ç¥ó¤òÆɤ߹þ¤ß¤Þ¤¹\n"
+msgstr "`%s'¤«¤é¥ª¥×¥·¥ç¥ó¤òÆɤ߹þ¤ß¤Þ¤¹\n"
 
-#: g10/g10.c:905
+#: g10/g10.c:950
 #, c-format
 msgid "%s is not a valid character set\n"
-msgstr "%s ¤ÏÀµ¤·¤¤Ê¸»ú¥³¡¼¥É¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
+msgstr "%s¤ÏÀµ¤·¤¤Ê¸»ú½¸¹ç¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:970
+#: g10/g10.c:1024
 msgid "WARNING: program may create a core file!\n"
-msgstr "·Ù¹ð: ¥×¥í¥°¥é¥à¤Ï¥³¥¢¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Þ¤¹!\n"
+msgstr "·Ù¹ð: ¥×¥í¥°¥é¥à¤Î¥³¥¢¡¦¥Õ¥¡¥¤¥ë¤¬¤Ç¤­¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹!\n"
 
-#: g10/g10.c:974 g10/g10.c:983
+#: g10/g10.c:1028 g10/g10.c:1037
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
-msgstr "Ãí°Õ: %s ¤ÏÄ̾ï¤ÏÍѤ¤¤Þ¤»¤ó!\n"
+msgstr "Ãí°Õ: ÉáÄÌ%s¤ÏÍѤ¤¤Þ¤»¤ó!\n"
 
-#: g10/g10.c:976
+#: g10/g10.c:1030
 #, c-format
 msgid "%s not allowed with %s!\n"
-msgstr "%s ¤Ï %s ¤È¶¦¤ËÍѤ¤¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó!\n"
+msgstr "%s¤Ï%s¤È¤È¤â¤ËÍѤ¤¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó!\n"
 
-#: g10/g10.c:979
+#: g10/g10.c:1033
 #, c-format
 msgid "%s makes no sense with %s!\n"
-msgstr "%s ¤Ï %s ¤È¶¦¤ËÍѤ¤¤Æ¤â°ÕÌ£¤¬¤¢¤ê¤Þ¤»¤ó!\n"
+msgstr "%s¤Ï%s¤È¤È¤â¤ËÍѤ¤¤Æ¤â̵°ÕÌ£¤Ç¤¹!\n"
 
-#: g10/g10.c:998 g10/g10.c:1010
+#: g10/g10.c:1053 g10/g10.c:1065
 msgid "selected cipher algorithm is invalid\n"
 msgstr "ÁªÂò¤µ¤ì¤¿°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤Ï̵¸ú¤Ç¤¹\n"
 
-#: g10/g10.c:1004 g10/g10.c:1016
+#: g10/g10.c:1059 g10/g10.c:1071
 msgid "selected digest algorithm is invalid\n"
 msgstr "ÁªÂò¤µ¤ì¤¿Í×Ì󥢥르¥ê¥º¥à¤Ï̵¸ú¤Ç¤¹\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1075
 msgid "the given policy URL is invalid\n"
-msgstr "Í¿¤¨¤é¤ì¤¿¥Ý¥ê¥·¡¼ URL ¤Ï̵¸ú¤Ç¤¹\n"
+msgstr "¤¢¤¿¤¨¤é¤ì¤¿¥Ý¥ê¥·¡¼URL¤Ï̵¸ú¤Ç¤¹\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1078
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
-msgstr "°µ½Ì¥¢¥ë¥´¥ê¥º¥à¤Ï %d..%d ¤ÎÈϰϤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
+msgstr "°µ½Ì¥¢¥ë¥´¥ê¥º¥à¤Ï%d..%d¤ÎÈϰϤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1080
 msgid "completes-needed must be greater than 0\n"
-msgstr "completes-needed ¤Ï 0 ¤è¤êÂ礭¤ÊÃͤ¬É¬ÍפǤ¹\n"
+msgstr "completes-needed¤ÏÀµ¤ÎÃͤ¬É¬ÍפǤ¹\n"
 
-#: g10/g10.c:1027
+#: g10/g10.c:1082
 msgid "marginals-needed must be greater than 1\n"
-msgstr "marginals-needed ¤Ï 1 ¤è¤êÂ礭¤ÊÃͤ¬É¬ÍפǤ¹\n"
+msgstr "marginals-needed¤Ï1¤è¤êÂ礭¤ÊÃͤ¬É¬ÍפǤ¹\n"
 
-#: g10/g10.c:1029
+#: g10/g10.c:1084
 msgid "max-cert-depth must be in range 1 to 255\n"
-msgstr "max-cert-depth ¤Ï 1 ¤«¤é 255 ¤ÎÈϰϤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
+msgstr "max-cert-depth¤Ï1¤«¤é255¤ÎÈϰϤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1032
+#: g10/g10.c:1087
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
-msgstr "Ãí°Õ: ñ½ã¤Ê S2K ¥â¡¼¥É (0) ¤Î»ÈÍѤˤ϶¯¤¯È¿ÂФ·¤Þ¤¹\n"
+msgstr "Ãí°Õ: ñ½ã¤ÊS2K¥â¡¼¥É(0)¤Î»ÈÍѤˤ϶¯¤¯È¿ÂФ·¤Þ¤¹\n"
 
-#: g10/g10.c:1036
+#: g10/g10.c:1091
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
-msgstr "̵¸ú¤Ê S2K ¥â¡¼¥É¡£0, 1 ¤Þ¤¿¤Ï 3 ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
+msgstr "̵¸ú¤ÊS2K¥â¡¼¥É¡£0¤«1¤«3¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1121
+#: g10/g10.c:1176
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î½é´ü²½¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/g10.c:1127
+#: g10/g10.c:1182
 msgid "--store [filename]"
 msgstr "--store [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1134
+#: g10/g10.c:1189
 msgid "--symmetric [filename]"
 msgstr "--symmetric [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1142
+#: g10/g10.c:1197
 msgid "--encrypt [filename]"
 msgstr "--encrypt [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1210
 msgid "--sign [filename]"
 msgstr "--sign [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1223
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1237
 msgid "--clearsign [filename]"
 msgstr "--clearsign [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1199
+#: g10/g10.c:1254
 msgid "--decrypt [filename]"
 msgstr "--decrypt [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1262
 msgid "--sign-key user-id"
-msgstr "--sign-key user-id"
+msgstr "--sign-key ¥æ¡¼¥¶¡¼id"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1270
 msgid "--lsign-key user-id"
-msgstr "--lsign-key user-id"
+msgstr "--lsign-key ¥æ¡¼¥¶¡¼id"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1278
 msgid "--edit-key user-id [commands]"
-msgstr "--edit-key user-id [¥³¥Þ¥ó¥É]"
+msgstr "--edit-key ¥æ¡¼¥¶¡¼id [¥³¥Þ¥ó¥É]"
 
-#: g10/g10.c:1239
+#: g10/g10.c:1294
 msgid "--delete-secret-key user-id"
-msgstr "--delete-secret-key user-id"
+msgstr "--delete-secret-key ¥æ¡¼¥¶¡¼id"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1297
 msgid "--delete-key user-id"
-msgstr "--delete-key user-id"
+msgstr "--delete-key ¥æ¡¼¥¶¡¼id"
+
+#: g10/g10.c:1305
+#, fuzzy
+msgid "--delete-secret-and-public-key user-id"
+msgstr "--delete-secret-key ¥æ¡¼¥¶¡¼id"
 
-#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
 #, c-format
 msgid "can't open %s: %s\n"
-msgstr "%s ¤¬³«¤±¤Þ¤»¤ó: %s\n"
+msgstr "%s¤¬³«¤±¤Þ¤»¤ó: %s\n"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1357
 msgid "-k[v][v][v][c] [user-id] [keyring]"
-msgstr "-k[v][v][v][c] [user-id] [¸°¥ê¥ó¥°]"
+msgstr "-k[v][v][v][c] [¥æ¡¼¥¶¡¼id] [¸°ÎØ]"
 
-#: g10/g10.c:1360
+#: g10/g10.c:1423
 #, c-format
 msgid "dearmoring failed: %s\n"
-msgstr "Áõ¹Ã½üµî¤Ë¼ºÇÔ: %s\n"
+msgstr "ÊñÁõ½üµî¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/g10.c:1368
+#: g10/g10.c:1431
 #, c-format
 msgid "enarmoring failed: %s\n"
-msgstr "Áõ¹Ã²½¤Ë¼ºÇÔ: %s\n"
+msgstr "ÊñÁõ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/g10.c:1439
+#: g10/g10.c:1502
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
-msgstr "¥Ï¥Ã¥·¥å¥¢¥ë¥´¥ê¥º¥à `%s' ¤Ï̵¸ú¤Ç¤¹\n"
+msgstr "̵¸ú¤Ê¥Ï¥Ã¥·¥å¡¦¥¢¥ë¥´¥ê¥º¥à`%s'¤Ç¤¹\n"
 
-#: g10/g10.c:1520
+#: g10/g10.c:1589
 msgid "[filename]"
 msgstr "[¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1524
+#: g10/g10.c:1593
 msgid "Go ahead and type your message ...\n"
-msgstr "³«»Ï¤·¤Þ¤¹¡£¥á¥Ã¥»¡¼¥¸¤ò¥¿¥¤¥×¤·¤Æ²¼¤µ¤¤ ...\n"
+msgstr "³«»Ï¤·¤Þ¤¹¡£¥á¥Ã¥»¡¼¥¸¤ò¥¿¥¤¥×¤·¤Æ¤¯¤À¤µ¤¤ ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
-msgstr "`%s' ¤¬³«¤±¤Þ¤»¤ó\n"
+msgstr "`%s'¤¬³«¤±¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1737
+#: g10/g10.c:1805
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "Ãí¼á̾¤ÎÀèƬ¤Ïʸ»ú¤«¥¢¥ó¥À¡¼¥¹¥³¥¢(_)¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1743
+#: g10/g10.c:1811
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
-"Ãí¼á̾¤Ë¤Ïʸ»ú¡¢¿ô»ú¡¢¥É¥Ã¥È¡¢¥¢¥ó¥À¡¼¥¹¥³¥¢(_)¤Î¤ß¤òÍѤ¤¡¢'=' "
-"¤òȼ¤ï¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
+"Ãí¼á̾¤Ë¤Ïʸ»ú¡¢¿ô»ú¡¢¥É¥Ã¥È¡¢¥¢¥ó¥À¡¼¥¹¥³¥¢¤Î¤ß¤òÍѤ¤¡¢\n"
+"'='¤Ç½ª¤ï¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1749
+#: g10/g10.c:1817
 msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr "Ãí¼á̾¤Î¥É¥Ã¥È¤Ï¾¤Îʸ»ú¤Ç°Ï¤Þ¤ì¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
+msgstr "Ãí¼á̾¤Î¥É¥Ã¥È¤Ï¾¤Îʸ»ú¤Ç°Ï¤Þ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1757
+#: g10/g10.c:1825
 msgid "a notation value must not use any control characters\n"
 msgstr "Ãí¼á̾¤ÎÃͤËÀ©¸æʸ»ú¤òÍѤ¤¤Æ¤Ï¤¤¤±¤Þ¤»¤ó\n"
 
-#: g10/armor.c:302
+#: g10/armor.c:306
 #, c-format
 msgid "armor: %s\n"
-msgstr "Áõ¹Ã: %s\n"
+msgstr "ÊñÁõ: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:335
 msgid "invalid armor header: "
-msgstr "̵¸ú¤ÊÁõ¹Ã¥Ø¥Ã¥À: "
+msgstr "̵¸ú¤ÊÊñÁõ¥Ø¥Ã¥À¡¼: "
 
-#: g10/armor.c:338
+#: g10/armor.c:342
 msgid "armor header: "
-msgstr "Áõ¹Ã¥Ø¥Ã¥À: "
+msgstr "ÊñÁõ¥Ø¥Ã¥À¡¼: "
 
-#: g10/armor.c:349
+#: g10/armor.c:353
 msgid "invalid clearsig header\n"
-msgstr "̵¸ú¤Ê¥¯¥ê¥¢½ð̾¥Ø¥Ã¥À\n"
+msgstr "̵¸ú¤Ê¥¯¥ê¥¢½ð̾¥Ø¥Ã¥À¡¼\n"
 
-#: g10/armor.c:401
+#: g10/armor.c:405
 msgid "nested clear text signatures\n"
-msgstr "¥Í¥¹¥È¤µ¤ì¤¿¥¯¥ê¥¢½ð̾\n"
+msgstr "Æþ¤ì»Ò¤Î¥¯¥ê¥¢½ð̾\n"
 
-#: g10/armor.c:525
+#: g10/armor.c:529
 msgid "invalid dash escaped line: "
 msgstr "̵¸ú¤Ê¥À¥Ã¥·¥å¤Ç¥¨¥¹¥±¡¼¥×¤µ¤ì¤¿¹Ô: "
 
-#: g10/armor.c:537
+#: g10/armor.c:541
 msgid "unexpected armor:"
-msgstr "ͽ´ü¤·¤Ê¤¤Áõ¹Ã:"
+msgstr "ͽ´ü¤»¤ÌÊñÁõ:"
 
-#: g10/armor.c:654
+#: g10/armor.c:667 g10/armor.c:1235
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
-msgstr "̵¸ú¤Ê radix64 ʸ»ú %02x ¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹\n"
+msgstr "̵¸ú¤Ê64¿Êʸ»ú%02x¤ò¤È¤Ð¤·¤Þ¤¹\n"
 
-#: g10/armor.c:697
+#: g10/armor.c:710
 msgid "premature eof (no CRC)\n"
-msgstr "eof ¤¬Á᤹¤®¤Þ¤¹ (CRC ¤¬¤¢¤ê¤Þ¤»¤ó)\n"
+msgstr "¥Õ¥¡¥¤¥ëËöÈø¤¬Á᤹¤®¤Þ¤¹ (CRC¤¬¤¢¤ê¤Þ¤»¤ó)\n"
 
-#: g10/armor.c:731
+#: g10/armor.c:744
 msgid "premature eof (in CRC)\n"
-msgstr "eof ¤¬Á᤹¤®¤Þ¤¹ (CRC ¤ÎÃæ¤Ë¤¢¤ê¤Þ¤¹)\n"
+msgstr "¥Õ¥¡¥¤¥ëËöÈø¤¬Á᤹¤®¤Þ¤¹ (CRC¤ÎÃæ¤Ë¤¢¤ê¤Þ¤¹)\n"
 
-#: g10/armor.c:735
+#: g10/armor.c:748
 msgid "malformed CRC\n"
-msgstr "CRC ¤Î½ñ¼°¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó\n"
+msgstr "CRC¤Î½ñ¼°¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/armor.c:739
+#: g10/armor.c:752 g10/armor.c:1272
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
-msgstr "CRC ¥¨¥é¡¼; %06lx - %06lx\n"
+msgstr "CRC¥¨¥é¡¼¡£%06lx - %06lx\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:772
 msgid "premature eof (in Trailer)\n"
-msgstr "eof ¤¬Á᤹¤®¤Þ¤¹ (Trailer ¤ÎÃæ¤Ë¤¢¤ê¤Þ¤¹)\n"
+msgstr "¥Õ¥¡¥¤¥ëËöÈø¤¬Á᤹¤®¤Þ¤¹ (¸åÈøÉô¤ÎÃæ¤Ë¤¢¤ê¤Þ¤¹)\n"
 
-#: g10/armor.c:760
+#: g10/armor.c:776
 msgid "error in trailer line\n"
-msgstr "Trailer ¹Ô¤Ë¥¨¥é¡¼¤¬¤¢¤ê¤Þ¤¹\n"
+msgstr "¸åÈø¤Î¹Ô¤Ë¥¨¥é¡¼¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: g10/armor.c:906
+#: g10/armor.c:922
 msgid "For info see http://www.gnupg.org"
-msgstr ""
+msgstr "KUHASIKU WA http://www.gnupg.org/ WO GORANKUDASAI"
 
-#: g10/armor.c:1027
+#: g10/armor.c:1050
 msgid "no valid OpenPGP data found.\n"
-msgstr "Í­¸ú¤Ê OpenPGP ¥Ç¡¼¥¿¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
+msgstr "Í­¸ú¤ÊOpenPGP¥Ç¡¼¥¿¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£\n"
 
-#: g10/armor.c:1032
+#: g10/armor.c:1055
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
-msgstr "̵¸ú¤ÊÁõ¹Ã: ¹Ô¤ÎŤµ¤¬ %d ʸ»ú¤ò±Û¤¨¤Æ¤¤¤Þ¤¹\n"
+msgstr "̵¸ú¤ÊÊñÁõ: ¹Ô¤ÎŤµ¤¬%dʸ»ú¤òĶ¤¨¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/armor.c:1036
+#: g10/armor.c:1059
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
-"Áõ¹Ã¤ÎÃæ¤Ë quoted printable ʸ»ú¤¬¤¢¤ê¤Þ¤¹¡£¤ª¤½¤é¤¯¥Ð¥°¤Î¤¢¤ë MTA "
-"¤¬»ÈÍѤµ¤ì¤¿¤Î¤Ç¤·¤ç¤¦\n"
+"ÊñÁõ¤ÎÃæ¤Ë quoted printable ʸ»ú¤¬¤¢¤ê¤Þ¤¹¡£¤ª¤½¤é¤¯¥Ð¥°¤Î¤¢¤ë\n"
+"MTA¤ò»ÈÍѤ·¤¿¤Î¤Ç¤·¤ç¤¦\n"
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
 msgid "             Fingerprint:"
-msgstr "             »ØÌæ:"
+msgstr "                    »ØÌæ:"
 
 #: g10/pkclist.c:80
 msgid "Fingerprint:"
@@ -971,33 +1032,31 @@
 
 #: g10/pkclist.c:116
 msgid "No reason specified"
-msgstr ""
+msgstr "Íýͳ¤Ï»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
 #: g10/pkclist.c:118
-#, fuzzy
 msgid "Key is superseded"
-msgstr "¸°¤ÏÊݸ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
+msgstr "¸°¤¬¤È¤ê¤«¤ï¤Ã¤Æ¤¤¤Þ¤¹"
 
 #: g10/pkclist.c:120
-#, fuzzy
 msgid "Key has been compromised"
-msgstr "¤³¤Î¸°¤Ï»ÈÍÑÉԲĤËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹"
+msgstr "¸°¤¬¥Ñ¥¯¤é¤ì¤Þ¤·¤¿"
 
 #: g10/pkclist.c:122
 msgid "Key is no longer used"
-msgstr ""
+msgstr "¸°¤Ï¤â¤¦»È¤ï¤ì¤Æ¤¤¤Þ¤»¤ó"
 
 #: g10/pkclist.c:124
 msgid "User ID is no longer valid"
-msgstr ""
+msgstr "¥æ¡¼¥¶¡¼ID¤¬¤â¤¦Í­¸ú¤Ç¤¢¤ê¤Þ¤»¤ó"
 
 #: g10/pkclist.c:128
 msgid "Reason for revocation: "
-msgstr ""
+msgstr "ÇË´þÍýͳ: "
 
 #: g10/pkclist.c:145
 msgid "Revocation comment: "
-msgstr ""
+msgstr "ŬÍÑ: "
 
 #. a string with valid answers
 #: g10/pkclist.c:303
@@ -1010,7 +1069,7 @@
 "No trust value assigned to %lu:\n"
 "%4u%c/%08lX %s \""
 msgstr ""
-"%lu ¤Ë¿®ÍÑÅÙ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó:\n"
+"%lu¤Ë¿®ÍÑÅÙ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó:\n"
 "%4u%c/%08lX %s \""
 
 #: g10/pkclist.c:319
@@ -1025,18 +1084,18 @@
 " 4 = I trust fully\n"
 " s = please show me more information\n"
 msgstr ""
-"¾¤Î¥æ¡¼¥¶¤Î¸°¤òÀµ¤·¤¯¸¡¾Ú¤¹¤ë¤¿¤á¤Ë¡¢¤³¤Î¥æ¡¼¥¶¤Î¿®ÍÑÅÙ¤ò·è¤á¤Æ²¼¤µ¤¤\n"
-"(¥Ñ¥¹¥Ý¡¼¥È¤ò¸«¤»¤Æ¤â¤é¤Ã¤¿¤ê¡¢Â¾¤«¤éÆÀ¤¿»ØÌæ¤È¾È¹ç¤·¤¿¤ê...)?\n"
+"¾¤Î¥æ¡¼¥¶¡¼¤Î¸°¤òÀµ¤·¤¯¸¡¾Ú¤¹¤ë¤¿¤á¤Ë¡¢¤³¤Î¥æ¡¼¥¶¡¼¤Î¿®ÍÑÅÙ¤ò·è¤á¤Æ\n"
+"¤¯¤À¤µ¤¤(¥Ñ¥¹¥Ý¡¼¥È¤ò¸«¤»¤Æ¤â¤é¤Ã¤¿¤ê¡¢Â¾¤«¤éÆÀ¤¿»ØÌæ¤È¾È¹ç¤·¤¿¤ê...)?\n"
 "\n"
 " 1 = ̤ÃÎ\n"
-" 2 = ¿®ÍѤ·¤Ê¤¤\n"
+" 2 = ¿®ÍѤ· ¤Ê¤¤\n"
 " 3 = ¤¢¤ëÄøÅÙ¿®ÍѤ¹¤ë\n"
 " 4 = ´°Á´¤Ë¿®ÍѤ¹¤ë\n"
 " s = ¤è¤ê¾Ü¤·¤¤¾ðÊó¤ò¸«¤ë\n"
 
 #: g10/pkclist.c:328
 msgid " m = back to the main menu\n"
-msgstr " m = ¥á¥¤¥ó¥á¥Ë¥å¡¼¤ËÌá¤ë\n"
+msgstr " m = ¥á¡¼¥ó¡¦¥á¥Ë¥å¡¼¤ËÌá¤ë\n"
 
 #: g10/pkclist.c:330
 msgid " q = quit\n"
@@ -1056,8 +1115,8 @@
 "can assign some missing owner trust values.\n"
 "\n"
 msgstr ""
-"¸°¤Ø¤ÎÍ­¸ú¤Ê¿®ÍѤΥѥ¹¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£·ç¤±¤Æ¤¤¤ë¿Í¤Î¿®ÍÑÅÙ¤ò\n"
-"ÀßÄê¤Ç¤­¤Ê¤¤¤«¤É¤¦¤«¡¢Ä´¤Ù¤Þ¤·¤ç¤¦¡£\n"
+"¸°¤Ø¤ÎÍ­¸ú¤Ê¿®ÍѤηÐÏ©¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£\n"
+"¤¤¤Ê¤¤¿Í¤Î¿®ÍÑÅÙ¤¬ÀßÄê¤Ç¤­¤Ê¤¤¤«¤É¤¦¤«¡¢Ä´¤Ù¤Þ¤·¤ç¤¦¡£\n"
 "\n"
 
 #: g10/pkclist.c:435
@@ -1065,7 +1124,7 @@
 "No path leading to one of our keys found.\n"
 "\n"
 msgstr ""
-"²æ¡¹¤Î¸°¤Ø»ê¤ë¥Ñ¥¹¤¬¤¢¤ê¤Þ¤»¤ó¡£\n"
+"¤³¤Á¤é¤Î¸°¤Ø»ê¤ë·ÐÏ©¤¬¤¢¤ê¤Þ¤»¤ó¡£\n"
 "\n"
 
 #: g10/pkclist.c:437
@@ -1087,21 +1146,21 @@
 #: g10/pkclist.c:457
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
-msgstr "¸° %08lX: ¸°¤ÏÇË´þºÑ¤ß¤Ç¤¹!\n"
+msgstr "¸°%08lX: ¸°¤ÏÇË´þºÑ¤ß¤Ç¤¹!\n"
 
 #: g10/pkclist.c:464 g10/pkclist.c:476 g10/pkclist.c:598
 msgid "Use this key anyway? "
-msgstr "¤½¤ì¤Ç¤â ¤³¤Î¸°¤ò»È¤¤¤Þ¤¹¤«? "
+msgstr "¤½¤ì¤Ç¤â¤³¤Î¸°¤ò»È¤¤¤Þ¤¹¤«? "
 
 #: g10/pkclist.c:469
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
-msgstr "¸° %08lX: Éû¸°¤ÏÇË´þºÑ¤ß¤Ç¤¹!\n"
+msgstr "¸°%08lX: Éû¸°¤ÏÇË´þºÑ¤ß¤Ç¤¹!\n"
 
 #: g10/pkclist.c:512
 #, c-format
 msgid "%08lX: key has expired\n"
-msgstr "¸° %08lX: ¸°¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹!\n"
+msgstr "¸°%08lX: ¸°¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹\n"
 
 #: g10/pkclist.c:518
 #, c-format
@@ -1111,14 +1170,16 @@
 #: g10/pkclist.c:533
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
-msgstr "%08lX: ¤³¤Î¸°¤Ï¿®ÍѤǤ­¤Þ¤»¤ó\n"
+msgstr "%08lX: ¤³¤Î¸°¤Ï¿®ÍѤǤ­¤Þ ¤»¤ó\n"
 
 #: g10/pkclist.c:539
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
 "but it is accepted anyway\n"
-msgstr "%08lX: ¤³¤Î¸°¤Ï¼ÂºÝ¤ËËܿͤΤâ¤Î¤«¤ÏÉÔÌÀ¤Ç¤¹¤¬¡¢¤½¤ì¤Ç¤â¼õ¤±Æþ¤ì¤Þ¤¹\n"
+msgstr ""
+"%08lX: ¤³¤Î¸°¤Ï¼ÂºÝ¤ËËܿͤΤâ¤Î¤«¤ÏÉÔÌÀ¤Ç¤¹¤¬¡¢\n"
+"¤¤¤Á¤ª¤¦¼õÍý¤·¤Þ¤¹\n"
 
 #: g10/pkclist.c:545
 msgid "This key probably belongs to the owner\n"
@@ -1135,9 +1196,9 @@
 "the next question with yes\n"
 "\n"
 msgstr ""
-"¤³¤Î¸°¤ÏËܿͤΤâ¤Î¤«¤É¤¦¤«³Î¿®¤Ç¤­¤Þ¤»¤ó¡£\n"
+"¤³¤Î¸°¤ÏËܿͤΤâ¤Î¤«¤É¤¦¤«³Î¿®¤Ç¤­¤Þ ¤»¤ó¡£\n"
 "º£¤«¤é¹Ô¤¦¤³¤È¤ò *³Î¼Â¤Ë* Íý²ò¤·¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢\n"
-"¼¡¤Î¼ÁÌä¤Ë¤Ï no ¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£\n"
+"¼¡¤Î¼ÁÌä¤Ë¤Ïno¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£\n"
 "\n"
 
 #: g10/pkclist.c:607 g10/pkclist.c:630
@@ -1150,7 +1211,7 @@
 
 #: g10/pkclist.c:652
 msgid "         This could mean that the signature is forgery.\n"
-msgstr "         ½ð̾¤Ïµ¶Êª¤À¤È»×¤ï¤ì¤Þ¤¹¡£\n"
+msgstr "      ½ð̾¤¬µ¶Êª¤Ê¤³¤È¤â¤¢¤ë¡¢¤È¤¤¤¦¤³¤È¤Ç¤¹¡£\n"
 
 #: g10/pkclist.c:657
 msgid "WARNING: This subkey has been revoked by its owner!\n"
@@ -1162,82 +1223,84 @@
 
 #: g10/pkclist.c:687
 msgid "WARNING: This key is not certified with a trusted signature!\n"
-msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï¿®ÍѤǤ­¤ë½ð̾¤Ë¤è¤Ã¤Æ¾ÚÌÀ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!\n"
+msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï¿®ÍѤǤ­¤ë½ð̾¤Ç¾ÚÌÀ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!\n"
 
 #: g10/pkclist.c:689
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
-msgstr "         ¤³¤Î½ð̾¤¬ËܿͤΤâ¤Î¤«¤É¤¦¤«¤Î¸¡¾Ú¼êÃʤ¬¤¢¤ê¤Þ¤»¤ó¡£\n"
+msgstr "      ¤³¤Î½ð̾¤¬ËܿͤΤâ¤Î¤«¤É¤¦¤«¤Î¸¡¾Ú¼êÃʤ¬¤¢¤ê¤Þ¤»¤ó¡£\n"
 
 #: g10/pkclist.c:706
 msgid "WARNING: We do NOT trust this key!\n"
-msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï¿®ÍѤǤ­¤Þ¤»¤ó!\n"
+msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï¿®ÍѤǤ­¤Þ ¤»¤ó!\n"
 
 #: g10/pkclist.c:707
 msgid "         The signature is probably a FORGERY.\n"
-msgstr "         ¤³¤Î½ð̾¤Ï¤ª¤½¤é¤¯ µ¶Êª ¤Ç¤¹¡£\n"
+msgstr "      ¤³¤Î½ð̾¤Ï¤ª¤½¤é¤¯ µ¶Êª ¤Ç¤¹¡£\n"
 
 #: g10/pkclist.c:714
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
-msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï½½Ê¬¤Ë¿®ÍѤǤ­¤ë½ð̾¤Ë¤è¤Ã¤Æ¾ÚÌÀ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!\n"
+msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï½½Ê¬¤Ë¿®ÍѤǤ­¤ë½ð̾¤Ç¾ÚÌÀ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!\n"
 
 #: g10/pkclist.c:717
 msgid "         It is not certain that the signature belongs to the owner.\n"
-msgstr "         ¤³¤Î½ð̾¤¬ËܿͤΤâ¤Î¤«¤É¤¦¤«³Î¿®¤Ç¤­¤Þ¤»¤ó¡£\n"
+msgstr "      ¤³¤Î½ð̾¤¬ËܿͤΤâ¤Î¤«¤É¤¦¤«³Î¿®¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ¥¹¥­¥Ã¥×: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï´û¤Ë¤¢¤ê¤Þ¤¹\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
-msgstr "¥æ¡¼¥¶ ID ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó(\"-r\" ¤òÍѤ¤¤¿¤Ç¤·¤ç¤¦)¡£\n"
+msgstr ""
+"¥æ¡¼¥¶¡¼ID¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó (¡Ö-r¡×¤òÍѤ¤¤Þ¤·¤ç¤¦) ¡£\n"
+"\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
-msgstr "¥æ¡¼¥¶ ID ¤òÆþÎÏ: "
+msgstr "¥æ¡¼¥¶¡¼ID¤òÆþÎÏ: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
-msgstr "¤½¤Î¥æ¡¼¥¶ ID ¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
+msgstr "¤½¤Î¥æ¡¼¥¶¡¼ID¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 msgid "skipped: public key already set as default recipient\n"
-msgstr "¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¼õ¿®¼Ô¤ËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹\n"
+msgstr "¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï´ûÄê¤Î¼õ¿®¼Ô¤È¤·¤ÆÀßÄêºÑ¤ß¤Ç¤¹\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
-msgstr "¸ø³«¸°¤ò̵»ë¤·¤Þ¤·¤¿¡£\n"
+msgstr "¸ø³«¸°¤Ï»ÈÍѶػߤǤ¹¡£\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 msgid "skipped: public key already set with --encrypt-to\n"
-msgstr "¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï´û¤Ë --encrypt-to ¤Ë¤ÆÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹\n"
+msgstr "¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï´û¤Ë --encrypt-to ¤ÇÀßÄêºÑ¤ß¤Ç¤¹\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
-msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¼õ¿®¼Ô `%s' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
+msgstr "´ûÄê¤Î¼õ¿®¼Ô`%s'¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
-msgstr "%s: ¸°¤Î¥¨¥é¡¼: %s\n"
+msgstr "%s: ¸°¤Î¸¡¾Ú¥¨¥é¡¼: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
-msgstr "%s: ¥¹¥­¥Ã¥×: ¸ø³«¸°¤ò̵»ë¤·¤Þ¤·¤¿\n"
+msgstr "%s: ¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï»ÈÍѶػß\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "Í­¸ú¤Ê¥¢¥É¥ì¥¹¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
@@ -1245,62 +1308,66 @@
 msgid "writing self signature\n"
 msgstr "¼«¸Ê½ð̾¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
 
-#: g10/keygen.c:214
+#: g10/keygen.c:217
 msgid "writing key binding signature\n"
 msgstr "½ð̾¤ËÂбþ¤¹¤ë¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
 
-#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
-#, fuzzy, c-format
+#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
+#, c-format
 msgid "keysize invalid; using %u bits\n"
-msgstr "Í׵ᤵ¤ì¤¿¸°¥µ¥¤¥º¤Ï %u ¥Ó¥Ã¥È\n"
+msgstr "̵¸ú¤Ê¸°¥µ¥¤¥º¡£%u¥Ó¥Ã¥È¤Ë¤·¤Þ¤¹\n"
 
-#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
-#, fuzzy, c-format
+#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
+#, c-format
 msgid "keysize rounded up to %u bits\n"
-msgstr "%u ¥Ó¥Ã¥È¤Ë´Ý¤á¤Þ¤¹\n"
+msgstr "¸°¥µ¥¤¥º¤ò%u¥Ó¥Ã¥È¤Ë´Ý¤á¤Þ¤¹\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:549
 msgid "Please select what kind of key you want:\n"
-msgstr "¸°¤Î¼ïÎà¤òÁªÂò¤·¤Æ²¼¤µ¤¤:\n"
+msgstr "¤¹¤­¤Ê¸°¤Î¼ïÎà¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤:\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:551
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
-msgstr "   (%d) DSA ¤È ElGamal (¥Ç¥Õ¥©¥ë¥È)\n"
+msgstr "   (%d) DSA¤ÈElGamal (´ûÄê)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:552
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (½ð̾¤Î¤ß)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:554
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (°Å¹æ²½¤Î¤ß)\n"
 
-#: g10/keygen.c:546
+#: g10/keygen.c:555
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (½ð̾¤È°Å¹æ²½)\n"
 
-#: g10/keygen.c:548
-#, fuzzy, c-format
+#: g10/keygen.c:557
+#, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (½ð̾¤È°Å¹æ²½)\n"
+msgstr "   (%d) RSA (½ð̾¤È°Å¹æ²½)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:561
 msgid "Your selection? "
-msgstr "¤É¤ì¤òÁª¤Ó¤Þ¤¹¤«? "
+msgstr "¤É¤ì¤Ë¤·¤Þ¤¹¤«? "
 
-#: g10/keygen.c:563 g10/keygen.c:571
+#: g10/keygen.c:572
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "ËÜÅö¤Ë½ð̾¤È°Å¹æÍѤθ°¤òºî¤ê¤Þ¤¹¤«? "
 
-#: g10/keygen.c:585
+#: g10/keygen.c:580
+msgid "The use of this algorithm is deprecated - create anyway? "
+msgstr ""
+
+#: g10/keygen.c:594
 msgid "Invalid selection.\n"
 msgstr "̵¸ú¤ÊÁªÂò¤Ç¤¹¡£\n"
 
-#: g10/keygen.c:597
+#: g10/keygen.c:606
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1308,27 +1375,26 @@
 "              default keysize is 1024 bits\n"
 "    highest suggested keysize is 2048 bits\n"
 msgstr ""
-"¿·¤·¤¤ %s ¸°¥Ú¥¢¤ÎÀ¸À®¤Ë¤Ä¤¤¤Æ\n"
-"             ºÇ¾®¤Î¸°¥µ¥¤¥º¤Ï is  768 ¥Ó¥Ã¥È\n"
-"          ¥Ç¥Õ¥©¥ë¥È¤Î¸°¥µ¥¤¥º¤Ï 1024 ¥Ó¥Ã¥È\n"
-"                ºÇÂç¤Î¸°¥µ¥¤¥º¤Ï 2048 ¥Ó¥Ã¥È\n"
+"¿·¤·¤¤%s¸°ÂФòÀ¸À®¤·¤Þ¤¹¡£\n"
+"             ºÇ¾®¤Î¸°Ä¹¤Ï  768 ¥Ó¥Ã¥È\n"
+"             ´ûÄê¤Î¸°Ä¹¤Ï 1024 ¥Ó¥Ã¥È\n"
+"         ºÇÂç¤Î¿ä¾©¸°Ä¹¤Ï 2048 ¥Ó¥Ã¥È\n"
 
-#: g10/keygen.c:604
+#: g10/keygen.c:613
 msgid "What keysize do you want? (1024) "
-msgstr "¤É¤Î¸°¥µ¥¤¥º¤òÁªÂò¤·¤Þ¤¹¤«? (1024) "
+msgstr "¤É¤Î¸°Ä¹¤Ë¤·¤Þ¤¹¤«? (1024) "
 
-#: g10/keygen.c:609
+#: g10/keygen.c:618
 msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA ¤Î¸°¥µ¥¤¥º¤Ï 512 ¤«¤é 1024 ¤Þ¤Ç¤Ç¤¹\n"
+msgstr "DSA¤Î¸°Ä¹¤Ï512¤«¤é1024¤Þ¤Ç¤Ç¤¹\n"
 
-#: g10/keygen.c:611
+#: g10/keygen.c:620
 msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "¸°¥µ¥¤¥º¤¬¾®¤µ¤¹¤®¤Þ¤¹; 768 ¤¬ºÇ¾®¤Ç¤¹¡£\n"
+msgstr "¸°Ä¹¤¬¾®¤µ¤¹¤®¤Þ¤¹¡£ºÇ¾®¤Ç¤â768¤Ç¤¹¡£\n"
 
-#: g10/keygen.c:613
-#, fuzzy
+#: g10/keygen.c:622
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "¸°¥µ¥¤¥º¤¬¾®¤µ¤¹¤®¤Þ¤¹; 768 ¤¬ºÇ¾®¤Ç¤¹¡£\n"
+msgstr "¸°Ä¹¤¬¾®¤µ¤¹¤®¤Þ¤¹¡£RSA¤ÏºÇ¾®¤Ç¤â1024¤Ç¤¹¡£\n"
 
 #. It is ridiculous and an annoyance to use larger key sizes!
 #. * GnuPG can handle much larger sizes; but it takes an eternity
@@ -1338,46 +1404,46 @@
 #. * 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:624
+#: g10/keygen.c:633
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "¸°¥µ¥¤¥º¤¬Â礭¤¹¤®¤Þ¤¹; %d ¤¬ºÇÂç¤Ç¤¹¡£\n"
+msgstr "¸°Ä¹¤¬Â礭¤¹¤®¤Þ¤¹¡£%d¤¬ºÇÂç¤Ç¤¹¡£\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:638
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
 msgstr ""
-"2048 °Ê¾å¤Î¸°¥µ¥¤¥º¤Ï¡¢·×»»»þ´Ö¤¬ Èó¾ï¤Ë Ť¯¤Ê¤ë¤Î¤Ç\n"
+"2048¤è¤êÂ礭¤Ê¸°Ä¹¤Ï¡¢·×»»»þ´Ö¤¬ Èó¾ï¤Ë Ť¯¤Ê¤ë¤Î¤Ç\n"
 "¿ä¾©¤·¤Þ¤»¤ó!\n"
 
-#: g10/keygen.c:632
+#: g10/keygen.c:641
 msgid "Are you sure that you want this keysize? "
-msgstr "¤³¤Î¸°¥µ¥¤¥º¤ÇËÜÅö¤ËÎɤ¤¤Ç¤¹¤«? "
+msgstr "¤³¤Î¸°Ä¹¤ÇËÜÅö¤Ë¤¤¤¤¤Ç¤¹¤«? "
 
-#: g10/keygen.c:633
+#: g10/keygen.c:642
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
 msgstr ""
-"¤ï¤«¤ê¤Þ¤·¤¿¡£¤·¤«¤·¡¢¤¢¤Ê¤¿¤Î¥â¥Ë¥¿¡¼¤ä¥­¡¼¥Ü¡¼¥ÉÆþÎϤϡ¢¹¶·â¤ËÂФ·¤Æ "
-"¤¹¤­¤À¤é¤±¤Ç¤¢¤ë¤³¤È¤ò¿´¤Ëα¤á¤Æ¤ª¤¤¤Æ²¼¤µ¤¤!\n"
+"¤ï¤«¤ê¤Þ¤·¤¿¡£¤·¤«¤·¡¢¤¢¤Ê¤¿¤Î¥â¥Ë¥¿¡¼¤ä¥­¡¼¥Ü¡¼¥ÉÆþÎϤϡ¢\n"
+"¹¶·â¤Ë¤¿¤¤¤·¤ÆÀȼå¤Ç¤¢¤ë¤³¤È¤ò¿´¤Ëα¤á¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤!\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:650
 msgid "Do you really need such a large keysize? "
-msgstr "¤¢¤Ê¤¿¤ÏËÜÅö¤Ë¤³¤Î¤è¤¦¤ÊŤ¤¸°¤¬É¬ÍפǤ¹¤«? "
+msgstr "¤³¤ó¤Ê¤ËŤ¤¸°¤¬ËÜÅö¤Ë¤¤¤ê¤Þ¤¹¤«? "
 
-#: g10/keygen.c:647
+#: g10/keygen.c:656
 #, c-format
 msgid "Requested keysize is %u bits\n"
-msgstr "Í׵ᤵ¤ì¤¿¸°¥µ¥¤¥º¤Ï %u ¥Ó¥Ã¥È\n"
+msgstr "Í׵ᤵ¤ì¤¿¸°Ä¹¤Ï%u¥Ó¥Ã¥È\n"
 
-#: g10/keygen.c:650 g10/keygen.c:654
+#: g10/keygen.c:659 g10/keygen.c:663
 #, c-format
 msgid "rounded up to %u bits\n"
-msgstr "%u ¥Ó¥Ã¥È¤Ë´Ý¤á¤Þ¤¹\n"
+msgstr "%u¥Ó¥Ã¥È¤Ë´Ý¤á¤Þ¤¹\n"
 
-#: g10/keygen.c:702
+#: g10/keygen.c:711
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1386,32 +1452,32 @@
 "      <n>m = key expires in n months\n"
 "      <n>y = key expires in n years\n"
 msgstr ""
-"¸°¤Î´ü¸Â¤ò·è¤á¤Æ²¼¤µ¤¤\n"
+"¸°¤Î´ü¸Â¤ò·è¤á¤Æ¤¯¤À¤µ¤¤¡£\n"
 "         0 = ̵´ü¸Â\n"
-"      <n>  = Í­¸ú´ü¸Â n Æü\n"
+"      <n>  = Í­¸ú´ü¸Â n Æü´Ö\n"
 "      <n>w = Í­¸ú´ü¸Â n ½µ´Ö\n"
-"      <n>m = Í­¸ú´ü¸Â n ·î\n"
-"      <n>y = Í­¸ú´ü¸Â n ǯ\n"
+"      <n>m = Í­¸ú´ü¸Â n ¤«·î´Ö\n"
+"      <n>y = Í­¸ú´ü¸Â n ǯ´Ö\n"
 
-#: g10/keygen.c:717
+#: g10/keygen.c:726
 msgid "Key is valid for? (0) "
-msgstr "¸°¤ÎÍ­¸úÀ­¤Ï? (0)"
+msgstr "¸°¤ÎÍ­¸ú´ü´Ö¤Ï? (0)"
 
-#: g10/keygen.c:722
+#: g10/keygen.c:731
 msgid "invalid value\n"
 msgstr "̵¸ú¤ÊÃÍ\n"
 
-#: g10/keygen.c:727
+#: g10/keygen.c:736
 msgid "Key does not expire at all\n"
 msgstr "¸°¤Ï̵´ü¸Â¤Ç¤¹\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:733
+#: g10/keygen.c:742
 #, c-format
 msgid "Key expires at %s\n"
-msgstr "¸°¤Ï %s ¤Ë¤Æ´ü¸ÂÀÚ¤ì¤Ë¤Ê¤ê¤Þ¤¹\n"
+msgstr "¸°¤Ï%s¤Ë¤Æ´ü¸ÂÀÚ¤ì¤Ë¤Ê¤ê¤Þ¤¹\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:745
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1419,11 +1485,11 @@
 "¤³¤Î¥·¥¹¥Æ¥à¤Ç¤Ï¡¢2038ǯ°Ê¹ß¤ÎÆüÉÕ¤òɽ¼¨¤Ç¤­¤Þ¤»¤ó¤¬¡¢\n"
 "2106ǯ¤Þ¤Ç¤Ê¤éÀµ¤·¤¯½èÍý¤Ç¤­¤Þ¤¹¡£\n"
 
-#: g10/keygen.c:741
+#: g10/keygen.c:750
 msgid "Is this correct (y/n)? "
-msgstr "¤³¤ì¤ÇÎɤ¤¤Ç¤¹¤« (y/n)? "
+msgstr "¤³¤ì¤Ç¤¤¤¤¤Ç¤¹¤« (y/n)? "
 
-#: g10/keygen.c:784
+#: g10/keygen.c:793
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1433,168 +1499,167 @@
 "\n"
 msgstr ""
 "\n"
-"¤¢¤Ê¤¿¤Î¸°¤ò¼±Ê̤¹¤ë¤¿¤á¤Ë ¥æ¡¼¥¶ ID ¤¬É¬ÍפǤ¹¡£\n"
-"¤³¤Î¥½¥Õ¥È¤ÏËÜ̾¡¢Ãí¼á¡¢ÅŻҥ᡼¥ë¥¢¥É¥ì¥¹¤«¤é¡¢¼¡¤Î½ñ¼°¤Ç¥æ¡¼¥¶ ID "
-"¤òºîÀ®¤·¤Þ¤¹:\n"
+"¤¢¤Ê¤¿¤Î¸°¤òƱÄꤹ¤ë¤¿¤á¤Ë¥æ¡¼¥¶¡¼ID¤¬É¬ÍפǤ¹¡£\n"
+"¤³¤Î¥½¥Õ¥È¤ÏËÜ̾¡¢¥³¥á¥ó¥È¡¢ÅŻҥ᡼¥ë¡¦¥¢¥É¥ì¥¹¤«¤é\n"
+"¼¡¤Î½ñ¼°¤Ç¥æ¡¼¥¶¡¼ID¤ò¹½À®¤·¤Þ¤¹:\n"
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:796
+#: g10/keygen.c:805
 msgid "Real name: "
 msgstr "ËÜ̾: "
 
-#: g10/keygen.c:804
+#: g10/keygen.c:813
 msgid "Invalid character in name\n"
 msgstr "̾Á°¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: g10/keygen.c:806
+#: g10/keygen.c:815
 msgid "Name may not start with a digit\n"
-msgstr "̾Á°¤Ï¿ô»ú¤Ç»Ï¤Þ¤Ã¤Æ¤Ï¤¤¤±¤Þ¤»¤ó\n"
+msgstr "̾Á°¤ò¿ô»ú¤Ç»Ï¤á¤Æ¤Ï¤¤¤±¤Þ¤»¤ó\n"
 
-#: g10/keygen.c:808
+#: g10/keygen.c:817
 msgid "Name must be at least 5 characters long\n"
-msgstr "̾Á°¤Ï 5 ʸ»ú°Ê¾å¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
+msgstr "̾Á°¤Ï5ʸ»ú°Ê¾å¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/keygen.c:816
+#: g10/keygen.c:825
 msgid "Email address: "
-msgstr "ÅŻҥ᡼¥ë¥¢¥É¥ì¥¹: "
+msgstr "ÅŻҥ᡼¥ë¡¦¥¢¥É¥ì¥¹: "
 
-#: g10/keygen.c:827
+#: g10/keygen.c:836
 msgid "Not a valid email address\n"
-msgstr "Í­¸ú¤ÊÅŻҥ᡼¥ë¥¢¥É¥ì¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
+msgstr "Í­¸ú¤ÊÅŻҥ᡼¥ë¡¦¥¢¥É¥ì¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keygen.c:835
+#: g10/keygen.c:844
 msgid "Comment: "
-msgstr "Ãí¼á: "
+msgstr "¥³¥á¥ó¥È: "
 
-#: g10/keygen.c:841
+#: g10/keygen.c:850
 msgid "Invalid character in comment\n"
-msgstr "Ãí¼á¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n"
+msgstr "¥³¥á¥ó¥È¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: g10/keygen.c:864
+#: g10/keygen.c:873
 #, c-format
 msgid "You are using the `%s' character set.\n"
-msgstr "¤¢¤Ê¤¿¤Ïʸ»ú¥³¡¼¥É `%s' ¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
+msgstr "¤¢¤Ê¤¿¤Ïʸ»ú½¸¹ç`%s'¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: g10/keygen.c:870
+#: g10/keygen.c:879
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
 "    \"%s\"\n"
 "\n"
 msgstr ""
-"¼¡¤Î¥æ¡¼¥¶ ID ¤òÀßÄꤷ¤Þ¤·¤¿:\n"
+"¼¡¤Î¥æ¡¼¥¶¡¼ID¤òÀßÄꤷ¤Þ¤·¤¿:\n"
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:883
 msgid "Please don't put the email address into the real name or the comment\n"
-msgstr ""
+msgstr "ÅŻҥ᡼¥ë¤Î¥¢¥É¥ì¥¹¤òËÜ̾¤ä¥³¥á¥ó¥È¤ËÆþ¤ì¤Ê¤¤¤è¤¦¤Ë\n"
 
-#: g10/keygen.c:879
+#: g10/keygen.c:888
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:889
-#, fuzzy
+#: g10/keygen.c:898
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
-msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
+msgstr "̾Á°(N)¡¢¥³¥á¥ó¥È(C)¡¢ÅŻҥ᡼¥ë(E)¤ÎÊѹ¹¡¢¤Þ¤¿¤Ï½ªÎ»(Q)? "
 
-#: g10/keygen.c:890
+#: g10/keygen.c:899
 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? "
+msgstr "̾Á°(N)¡¢¥³¥á¥ó¥È(C)¡¢ÅŻҥ᡼¥ë(E)¤ÎÊѹ¹¡¢¤Þ¤¿¤ÏOK(O)¤«½ªÎ»(Q)? "
 
-#: g10/keygen.c:909
+#: g10/keygen.c:918
 msgid "Please correct the error first\n"
-msgstr ""
+msgstr "¤Þ¤º¥¨¥é¡¼¤ò½¤Àµ¤·¤Æ¤¯¤À¤µ¤¤\n"
 
-#: g10/keygen.c:947
+#: g10/keygen.c:956
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
-"ÈëÌ©¸°¤òÊݸ¤ë¤¿¤á¤Ë¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬É¬ÍפǤ¹¡£\n"
+"ÈëÌ©¸°¤òÊݸ¤ë¤¿¤á¤Ë¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹¡£\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:964
 msgid "passphrase not correctly repeated; try again.\n"
-msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬°Û¤Ê¤ê¤Þ¤¹¡£¤â¤¦°ìÅÙÀßÄꤷ¤Æ²¼¤µ¤¤¡£\n"
+msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬°Û¤Ê¤ê¤Þ¤¹¡£¤â¤¦°ìÅÙÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:970
 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"
 "using this program with the option \"--edit-key\".\n"
 "\n"
 msgstr ""
-"¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬ÉÔɬÍפʤ褦¤Ç¤¹¤¬¡¢¤½¤ì¤Ï°­¤¤¹Í¤¨¤Ç¤¹!\n"
-"³¹Ô¤·¤Þ¤¹¡£¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ï¡¢¤³¤Î¥×¥í¥°¥é¥à¤Î \"--edit-key\" \n"
-"¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤Æ¡¢¤¤¤Ä¤Ç¤âÊѹ¹¤Ç¤­¤Þ¤¹¡£\n"
+"¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬ÉÔɬÍפʤ褦¤Ç¤¹¤¬¡¢¤ª¤½¤é¤¯¤½¤ì¤Ï¤í¤¯¤Ê¹Í¤¨¤Ç¤Ï\n"
+"¤¢¤ê¤Þ¤»¤ó! ¤¤¤Á¤ª¤¦Â³¹Ô¤·¤Þ¤¹¡£¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ï¡¢¤³¤Î¥×¥í¥°¥é¥à\n"
+"¤Î¡Ö--edit-key¡×¥ª¥×¥·¥ç¥ó¤Ç¤¤¤Ä¤Ç¤âÊѹ¹¤Ç¤­¤Þ¤¹¡£\n"
 "\n"
 
-#: g10/keygen.c:982
+#: g10/keygen.c:991
 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"
 "disks) during the prime generation; this gives the random number\n"
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
-"º£¤«¤éŤ¤Íð¿ô¤òÀ¸À®¤·¤Þ¤¹¡£¥­¡¼¥Ü¡¼¥É¤òÂǤĤȤ«¡¢¥Þ¥¦¥¹¤òÆ°¤«¤¹¤È¤«¡¢\n"
-"¥Ç¥£¥¹¥¯¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤Ê¤É¤Î¾¤Î¹ÔÆ°¤òƱ»þ¤Ë¹Ô¤¦¤È¡¢Íð¿ôÀ¸À®ÁõÃ֤ˤÆ\n"
-"Í𻨤µ¤ÎÂ礭¤ÊÎɤ¤Íð¿ô¤òÀ¸À®¤·¤ä¤¹¤¯¤Ê¤ê¤Þ¤¹¤Î¤Ç¡¢¤ª´«¤á¤·¤Þ¤¹¡£\n"
+"º£¤«¤éŤ¤Íð¿ô¤òÀ¸À®¤·¤Þ¤¹¡£¥­¡¼¥Ü¡¼¥É¤òÂǤĤȤ«¡¢¥Þ¥¦¥¹¤òÆ°¤«¤¹\n"
+"¤È¤«¡¢¥Ç¥£¥¹¥¯¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤È¤«¤Î¾¤Î¤³¤È¤ò¤¹¤ë¤È¡¢Íð¿ôÀ¸À®»Ò¤Ç\n"
+"Í𻨤µ¤ÎÂ礭¤Ê¤¤¤¤Íð¿ô¤òÀ¸À®¤·¤ä¤¹¤¯¤Ê¤ë¤Î¤Ç¡¢¤ª´«¤á¤·¤Þ¤¹¡£\n"
 
-#: g10/keygen.c:1431
+#: g10/keygen.c:1440
 msgid "DSA keypair will have 1024 bits.\n"
-msgstr "DSA ¸°¥Ú¥¢¤Ï 1024 ¥Ó¥Ã¥È¤Ë¤Ê¤ê¤Þ¤¹\n"
+msgstr "DSA¸°ÂФÏ1024¥Ó¥Ã¥È¤Ë¤Ê¤ê¤Þ¤¹¡£\n"
 
-#: g10/keygen.c:1474
+#: g10/keygen.c:1483
 msgid "Key generation canceled.\n"
 msgstr "¸°¤ÎÀ¸À®¤¬Ãæ»ß¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: g10/keygen.c:1571
-#, fuzzy, c-format
+#: g10/keygen.c:1581
+#, c-format
 msgid "writing public key to `%s'\n"
-msgstr "`%s' ¤Ø¤Î¸ø³«¾ÚÌÀ½ñ¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
+msgstr "`%s'¤Ø¸ø³«¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
 
-#: g10/keygen.c:1572
-#, fuzzy, c-format
+#: g10/keygen.c:1582
+#, c-format
 msgid "writing secret key to `%s'\n"
-msgstr "`%s' ¤Ø¤ÎÈëÌ©¾ÚÌÀ½ñ¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
+msgstr "`%s'¤ØÈëÌ©¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1679
 msgid "public and secret key created and signed.\n"
-msgstr "¸ø³«¸°¤ÈÈëÌ©¸°¤¬ºîÀ®¤µ¤ì¡¢½ð̾¤µ¤ì¤Þ¤·¤¿¡£\n"
+msgstr "¸ø³«¸°¤ÈÈëÌ©¸°¤òºî¤ê¡¢½ð̾¤·¤Þ¤·¤¿¡£\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1684
 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 ""
 "¤³¤Î¸°¤Ï°Å¹æ²½¤Ë¤Ï»ÈÍѤǤ­¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£°Å¹æ²½¤ò¹Ô¤¦¤Ë¤Ï¡¢\n"
-"\"--edit-key\" ¥³¥Þ¥ó¥É¤òÍѤ¤¤ÆÉû¸°¤òºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
+"¡Ö--edit-key¡×¥³¥Þ¥ó¥É¤òÍѤ¤¤ÆÉû¸°¤òÀ¸À®¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keygen.c:1690 g10/keygen.c:1791
+#: g10/keygen.c:1701 g10/keygen.c:1807
 #, c-format
 msgid "Key generation failed: %s\n"
-msgstr "¸°¤ÎºîÀ®¤Ë¼ºÇÔ: %s\n"
+msgstr "¸°¤ÎÀ¸À®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1748 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"
+msgstr "¸°¤Ï%luÉÃ̤Íè¤Ë¤Ç¤­¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n"
 
-#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1750 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"
+msgstr "¸°¤Ï%luÉÃ̤Íè¤Ë¤Ç¤­¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1783
 msgid "Really create? "
-msgstr "ËÜÅö¤ËºîÀ®¤·¤Þ¤¹¤«? "
+msgstr "ËÜÅö¤Ëºî¤ê¤Þ¤¹¤«? "
 
-#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1603,1284 +1668,1342 @@
 #: g10/encode.c:113
 #, c-format
 msgid "error creating passphrase: %s\n"
-msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÎÀ¸À®¤Ë¼ºÇÔ: %s\n"
+msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÎºîÀ®¥¨¥é¡¼: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ·Ù¹ð: ¶õ¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
-msgstr "`%s' ¤«¤éÆɤ߹þ¤ß¤Þ¤¹\n"
+msgstr "`%s'¤«¤éÆɤ߹þ¤ß¤Þ¤¹\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
-msgstr "%s/%s °Å¹æ²½ ¼õ¿®¼Ô: %s\n"
+msgstr "%s/%s°Å¹æ²½ ¼õ¿®¼Ô: %s\n"
 
 #: g10/export.c:153
 #, c-format
 msgid "%s: user not found: %s\n"
-msgstr "%s: ¥æ¡¼¥¶¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
+msgstr "%s: ¥æ¡¼¥¶¡¼¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
 
 #: g10/export.c:162
 #, c-format
 msgid "certificate read problem: %s\n"
-msgstr "¾ÚÌÀ½ñ¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ: %s\n"
+msgstr "¾ÚÌÀ½ñ¤ÎÆɹþ¤ß¾ã³²: %s\n"
 
 #: g10/export.c:171
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
-msgstr "¸° %08lX: rfc2440 ¤Î¸°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó - ¥¹¥­¥Ã¥×¤·¤Þ¤¹\n"
+msgstr "¸° %08lX: rfc2440¤Î¸°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó - ¥¹¥­¥Ã¥×\n"
 
 #: g10/export.c:182
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: not protected - skipped\n"
-msgstr "¸° %08lX: rfc2440 ¤Î¸°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó - ¥¹¥­¥Ã¥×¤·¤Þ¤¹\n"
+msgstr "¸° %08lX: Êݸ¤ì¤Æ¤¤¤Þ¤»¤ó - ¥¹¥­¥Ã¥×\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr "·Ù¹ð: ²¿¤â½ñ¤­½Ð¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:214
 msgid "too many entries in pk cache - disabled\n"
-msgstr "pk ¥­¥ã¥Ã¥·¥å¤Î¥¨¥ó¥È¥ê¡¼¤¬Â¿¤¹¤®¤Þ¤¹ - ̵»ë\n"
+msgstr "pk¥­¥ã¥Ã¥·¥å¤Î¥¨¥ó¥È¥ê¡¼¤¬Â¿¤¹¤®¤Þ¤¹ - »ÈÍѶػß\n"
 
-#: g10/getkey.c:350
-msgid "too many entries in unk cache - disabled\n"
-msgstr "unk ¥­¥ã¥Ã¥·¥å¤Î¥¨¥ó¥È¥ê¡¼¤¬Â¿¤¹¤®¤Þ¤¹ - ̵»ë\n"
-
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr "¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï RSA ¥­¡¼¤Ï»È¤¨¤Þ¤»¤ó\n"
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
-msgstr "¥æ¡¼¥¶ ID ¤Î¸°¤¬¤¢¤ê¤Þ¤»¤ó\n"
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+msgid "[User id not found]"
+msgstr "[¥æ¡¼¥¶¡¼id¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó]"
 
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
-msgstr "¸°¤Î¥æ¡¼¥¶ ID ¤¬¤¢¤ê¤Þ¤»¤ó\n"
+#: g10/getkey.c:453
+msgid "too many entries in unk cache - disabled\n"
+msgstr "unk¥­¥ã¥Ã¥·¥å¤Î¥¨¥ó¥È¥ê¡¼¤¬Â¿¤¹¤®¤Þ¤¹ - »ÈÍѶػß\n"
 
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2207
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
-msgstr "Éû¸° %08lX ¤ò»ÈÍѤ·¤Þ¤¹ - ¼ç¸° %08lX ¤ÎÂåÍÑ\n"
+msgstr "Éû¸°%08lX¤ò¼ç¸°%08lX¤ËÂåÍѤ·¤Þ¤¹\n"
 
-#: g10/getkey.c:2050
-#, fuzzy
-msgid "[User id not found]"
-msgstr "%s: ¥æ¡¼¥¶¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
+#: g10/getkey.c:2249 g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "¸°%08lX: ¸ø³«¸°¤Î¤Ê¤¤ÈëÌ©¸°¤Ç¤¹¡£¥¹¥­¥Ã¥×\n"
 
-#: g10/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
-msgstr "¥¿¥¤¥× %d ¤Î¥Ö¥í¥Ã¥¯¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹\n"
+msgstr "¥¿¥¤¥×%d¤Î¥Ö¥í¥Ã¥¯¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
-msgstr "%lu ¸°¤Þ¤Ç½èÍý\n"
+msgstr "%lu¸°¤Þ¤Ç½èÍý\n"
 
-#: g10/import.c:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
-msgstr "`%s' ¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ: %s\n"
+msgstr "`%s'¤ÎÆɹþ¤ß¥¨¥é¡¼: %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
-msgstr "½èÍý¿ô¤Î¹ç·×: %lu\n"
+msgstr "         ½èÍý¿ô¤Î¹ç·×: %lu\n"
 
-#: g10/import.c:206
-#, fuzzy, c-format
+#: g10/import.c:208
+#, c-format
 msgid "      skipped new keys: %lu\n"
-msgstr "            ¿·¤¿¤ÊÉû¸°: %lu\n"
+msgstr " ¥¹¥­¥Ã¥×¤·¤¿¿·¤·¤¤¸°: %lu\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
-msgstr "         ¥æ¡¼¥¶ ID ¤Ê¤·: %lu\n"
+msgstr "       ¥æ¡¼¥¶¡¼ID¤Ê¤·: %lu\n"
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
-msgstr "              Æɤ߹þ¤ß: %lu"
+msgstr "               Æɹþ¤ß: %lu"
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
-msgstr "              Êѹ¹¤Ê¤·: %lu\n"
+msgstr "             Êѹ¹¤Ê¤·: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
-msgstr "       ¿·¤¿¤Ê¥æ¡¼¥¶ ID: %lu\n"
+msgstr "     ¿·¤·¤¤¥æ¡¼¥¶¡¼ID: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
-msgstr "            ¿·¤¿¤ÊÉû¸°: %lu\n"
+msgstr "           ¿·¤·¤¤Éû¸°: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
-msgstr "            ¿·¤¿¤Ê½ð̾: %lu\n"
+msgstr "           ¿·¤·¤¤½ð̾: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
-msgstr "        ¿·¤¿¤Ê¸°¤ÎÇË´þ: %lu\n"
+msgstr "       ¿·¤·¤¤¸°¤ÎÇË´þ: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
-msgstr "      ÈëÌ©¸°¤ÎÆɤ߽Ф·: %lu\n"
+msgstr "       ÈëÌ©¸°¤ÎÆɽФ·: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
-msgstr "      ÈëÌ©¸°¤ÎÆɤ߹þ¤ß: %lu\n"
+msgstr "       ÈëÌ©¸°¤ÎÆɹþ¤ß: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
-msgstr "      Êѹ¹¤Î̵¤¤ÈëÌ©¸°: %lu\n"
+msgstr "       ̵Êѹ¹¤ÎÈëÌ©¸°: %lu\n"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
-msgstr "¸° %08lX: ¥æ¡¼¥¶ ID ¤¬¤¢¤ê¤Þ¤»¤ó\n"
+msgstr "¸°%08lX: ¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
-msgstr "¸° %08lX: ¿®ÍѤǤ­¤ë¥æ¡¼¥¶ ID ¤¬¤¢¤ê¤Þ¤»¤ó\n"
+msgstr "¸°%08lX: ¿®ÍѤǤ­¤ë¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 msgid "this may be caused by a missing self-signature\n"
-msgstr "¼«¸Ê½ð̾¤¬¤µ¤ì¤Æ¤¤¤Ê¤¤¤¿¤á¤Ç¤·¤ç¤¦\n"
+msgstr "¼«¸Ê½ð̾¤Î¤Ê¤¤¤»¤¤¤Ç¤·¤ç¤¦\n"
 
-#: g10/import.c:418 g10/import.c:657
+#: g10/import.c:435 g10/import.c:684
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
-msgstr "¸° %08lX: ¸ø³«¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
+msgstr "¸°%08lX: ¸ø³«¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
 
-#: g10/import.c:423
-#, fuzzy, c-format
+#: g10/import.c:440
+#, c-format
 msgid "key %08lX: new key - skipped\n"
-msgstr "¸° %08lX: rfc2440 ¤Î¸°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó - ¥¹¥­¥Ã¥×¤·¤Þ¤¹\n"
+msgstr "¸° %08lX: ¿·¤·¤¤¸°¤Ç¤¹ - ¥¹¥­¥Ã¥×\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
-msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¸ø³«¸°¥ê¥ó¥°¤¬¤¢¤ê¤Þ¤»¤ó\n"
+msgstr "´ûÄê¤Î¸ø³«¸°Îؤ¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
 #, c-format
 msgid "writing to `%s'\n"
-msgstr "`%s' ¤Ø¤Î½ñ¤­½Ð¤·\n"
+msgstr "`%s'¤Ø¤Î½ñ½Ð¤·\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
-msgstr "¸°¥ê¥ó¥° `%s' ¤Î¥í¥Ã¥¯¤¬¤Ç¤­¤Þ¤»¤ó: %s\n"
+msgstr "¸°ÎØ`%s'¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
-msgstr "¸°¥ê¥ó¥° `%s' ¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ: %s\n"
+msgstr "¸°ÎØ`%s'¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
-msgstr "¸° %08lX: ¸ø³«¸°¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n"
+msgstr "¸°%08lX: ¸ø³«¸°¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
-msgstr "¸° %08lX: ²æ¡¹¤ÎÊÝÍ­¤¹¤ë¸°¤È°Û¤Ê¤ê¤Þ¤¹\n"
+msgstr "¸°%08lX: ¤³¤Á¤é¤ÎÊ£À½¤È¹ç¤¤¤Þ¤»¤ó\n"
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:489 g10/import.c:692
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
-msgstr "¸° %08lX: ¥ª¥ê¥¸¥Ê¥ë¤Î¸°¥Ö¥í¥Ã¥¯¤Ë°ÌÃ֤Ǥ­¤Þ¤»¤ó: %s\n"
+msgstr "¸°%08lX: ¸µ¤Î¸°¥Ö¥í¥Ã¥¯¤Ë°ÌÃ֤Ť±¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: g10/import.c:478 g10/import.c:671
+#: g10/import.c:495 g10/import.c:698
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
-msgstr "¸° %08lX: ¥ª¥ê¥¸¥Ê¥ë¤Î¸°¥Ö¥í¥Ã¥¯¤òÆɤá¤Þ¤»¤ó: %s\n"
+msgstr "¸°%08lX: ¸µ¤Î¸°¥Ö¥í¥Ã¥¯¤òÆɤ߹þ¤á¤Þ¤»¤ó: %s\n"
 
-#: g10/import.c:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
-msgstr "¸° %08lX: ¿·¤¿¤Ê¥æ¡¼¥¶ ID ¤ò 1 ¸Ä\n"
+msgstr "¸°%08lX: ¿·¤·¤¤¥æ¡¼¥¶¡¼ID¤ò1¸Ä\n"
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
-msgstr "¸° %08lX: ¿·¤¿¤Ê¥æ¡¼¥¶ ID ¤ò %d ¸Ä\n"
+msgstr "¸°%08lX: ¿·¤·¤¤¥æ¡¼¥¶¡¼ID¤ò%d¸Ä\n"
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
-msgstr "¸° %08lX: ¿·¤¿¤Ê½ð̾¤ò 1 ¸Ä\n"
+msgstr "¸°%08lX: ¿·¤·¤¤½ð̾¤ò1¸Ä\n"
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
-msgstr "¸° %08lX: ¿·¤¿¤Ê½ð̾¤ò %d ¸Ä\n"
+msgstr "¸°%08lX: ¿·¤·¤¤½ð̾¤ò%d¸Ä\n"
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
-msgstr "¸° %08lX: ¿·¤¿¤ÊÉû¸°¤ò 1 ¸Ä\n"
+msgstr "¸°%08lX: ¿·¤·¤¤Éû¸°¤ò1¸Ä\n"
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
-msgstr "¸° %08lX: ¿·¤¿¤ÊÉû¸°¤ò %d ¸Ä\n"
+msgstr "¸°%08lX: ¿·¤·¤¤Éû¸°¤ò%d¸Ä\n"
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
-msgstr "¸° %08lX: Êѹ¹¤Ê¤·\n"
+msgstr "¸°%08lX: Êѹ¹¤Ê¤·\n"
 
-#: g10/import.c:613
+#: g10/import.c:610
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:640
 #, c-format
 msgid "key %08lX: secret key imported\n"
-msgstr "¸° %08lX: ÈëÌ©¸°¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n"
+msgstr "¸°%08lX: ÈëÌ©¸°¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n"
 
 #. we can't merge secret keys
-#: g10/import.c:617
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
-msgstr "¸° %08lX: ´û¤ËÈëÌ©¸°¥ê¥ó¥°¤Ë¤¢¤ê¤Þ¤¹\n"
+msgstr "¸°%08lX: ´û¤ËÈëÌ©¸°Îؤˤ¢¤ê¤Þ¤¹\n"
 
-#: g10/import.c:622
+#: g10/import.c:649
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
-msgstr "¸° %08lX: ÈëÌ©¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
+msgstr "¸°%08lX: ÈëÌ©¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
 
-#: g10/import.c:651
+#: g10/import.c:678
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
-msgstr "¸° %08lX: ¸ø³«¸°¤¬¤¢¤ê¤Þ¤»¤ó - ÇË´þ¾ÚÌÀ½ñ¤ÎŬÍѤ¬¤Ç¤­¤Þ¤»¤ó\n"
+msgstr "¸°%08lX: ¸ø³«¸°¤¬¤¢¤ê¤Þ¤»¤ó - ÇË´þ¾ÚÌÀ½ñ¤òŬÍѤǤ­¤Þ¤»¤ó\n"
 
-#: g10/import.c:682
+#: g10/import.c:709
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
-msgstr "¸° %08lX: ̵¸ú¤ÊÇË´þ¾ÚÌÀ½ñ: %s - µñÈݤ·¤Þ¤·¤¿\n"
+msgstr "¸°%08lX: ̵¸ú¤ÊÇË´þ¾ÚÌÀ½ñ: %s - µñÈÝ\n"
 
-#: g10/import.c:714
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
-msgstr "¸° %08lX: ÇË´þ¾ÚÌÀ½ñ¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n"
+msgstr "¸°%08lX: ÇË´þ¾ÚÌÀ½ñ¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n"
 
-#: g10/import.c:756
+#: g10/import.c:783
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
-msgstr "¸° %08lX: ½ð̾¤ËÂбþ¤¹¤ë¥æ¡¼¥¶ ID ¤¬¤¢¤ê¤Þ¤»¤ó\n"
+msgstr "¸°%08lX: ½ð̾¤ËÂбþ¤¹¤ë¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:790 g10/import.c:814
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
-msgstr "¸° %08lX: ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¸ø³«¸°¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹\n"
+msgstr "¸°%08lX: ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¸ø³«¸°¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹\n"
 
-#: g10/import.c:764
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
-msgstr "¸° %08lX: ¼«¸Ê½ð̾¤¬Ìµ¸ú¤Ç¤¹\n"
+msgstr "¸°%08lX: ̵¸ú¤Ê¼«¸Ê½ð̾¤Ç¤¹\n"
 
-#: g10/import.c:779
+#: g10/import.c:806
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
-msgstr "¸° %08lX: ¸°¤ËÂбþ¤¹¤ëÉû¸°¤¬¤¢¤ê¤Þ¤»¤ó\n"
+msgstr "¸°%08lX: ¸°¤ËÂбþ¤¹¤ëÉû¸°¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/import.c:788
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
-msgstr "¸° %08lX: ̵¸ú¤ÊÉû¸°¤ÎÂбþ¤Ç¤¹\n"
+msgstr "¸°%08lX: ̵¸ú¤ÊÉû¸°¤ÎÂбþ¤Ç¤¹\n"
 
-#: g10/import.c:815
+#: g10/import.c:842
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
-msgstr "¸° %08lX: ¼õ¤±Æþ¤ì¤¿¼«¸Ê½ð̾¤µ¤ì¤Æ¤¤¤Ê¤¤¥æ¡¼¥¶ ID '"
+msgstr "¸°%08lX: ¼õÍý¤·¤¿Ì¤¼«¸Ê½ð̾¤Î¥æ¡¼¥¶¡¼ID '"
 
-#: g10/import.c:844
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
-msgstr "¸° %08lX: ¥¹¥­¥Ã¥×¤·¤¿¥æ¡¼¥¶ ID '"
+msgstr "¸°%08lX: ¥¹¥­¥Ã¥×¤·¤¿¥æ¡¼¥¶¡¼ID '"
 
-#: g10/import.c:867
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
-msgstr "¸° %08lX: ¥¹¥­¥Ã¥×¤·¤¿Éû¸°\n"
+msgstr "¸°%08lX: ¥¹¥­¥Ã¥×¤·¤¿Éû¸°\n"
 
 #. here we violate the rfc a bit by still allowing
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:892
+#: g10/import.c:919
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
-msgstr "¸° %08lX: ½ñ¤­½Ð¤·ÉԲĤʽð̾ (class %02x) - ¥¹¥­¥Ã¥×\n"
+msgstr "¸°%08lX: ½ñ½Ð¤·ÉԲĤʽð̾ (¥¯¥é¥¹%02x) - ¥¹¥­¥Ã¥×\n"
 
-#: g10/import.c:901
+#: g10/import.c:928
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
-msgstr "¸° %08lX: ÇË´þ¾ÚÌÀ½ñ¤¬´Ö°ã¤Ã¤ÆÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹ - ¥¹¥­¥Ã¥×\n"
+msgstr "¸°%08lX: ÇË´þ¾ÚÌÀ½ñ¤¬¸í¤Ã¤ÆÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹ - ¥¹¥­¥Ã¥×\n"
 
-#: g10/import.c:909
+#: g10/import.c:936
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
-msgstr "¸° %08lX: ̵¸ú¤ÊÇË´þ¾ÚÌÀ½ñ: %s - ¥¹¥­¥Ã¥×\n"
+msgstr "¸°%08lX: ̵¸ú¤ÊÇË´þ¾ÚÌÀ½ñ: %s - ¥¹¥­¥Ã¥×\n"
 
-#: g10/import.c:1009
+#: g10/import.c:1036
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
-msgstr "¸° %08lX: ½ÅÊ£¤·¤¿¥æ¡¼¥¶ ID ¤Î¸¡½Ð - ÄɲÃ\n"
+msgstr "¸°%08lX: ½ÅÊ£¤·¤¿¥æ¡¼¥¶¡¼ID¤Î¸¡½Ð - Ê»¹ç\n"
 
-#: g10/import.c:1060
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
-msgstr "¸° %08lX: ÇË´þ¾ÚÌÀ½ñ¤ÎÄɲÃ\n"
+msgstr "¸°%08lX: ÇË´þ¾ÚÌÀ½ñ¤ÎÄɲÃ\n"
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
-msgstr "¸° %08lX: ²æ¡¹¤Î¥³¥Ô¡¼¤Ë¤Ï¼«¸Ê½ð̾¤¬¤¢¤ê¤Þ¤»¤ó\n"
+msgstr "¸°%08lX: ¤³¤Á¤é¤ÎÊ£À½¤Ë¤Ï¼«¸Ê½ð̾¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
-msgstr "%s: ¥æ¡¼¥¶¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
+msgstr "%s: ¥æ¡¼¥¶¡¼¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr "[ÇË´þ]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr "[¼«¸Ê½ð̾]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
-msgstr "̵¸ú¤Ê½ð̾ 1 ¸Ä\n"
+msgstr "̵¸ú¤Ê½ð̾1¸Ä\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
-msgstr "̵¸ú¤Ê½ð̾ %d ¸Ä\n"
+msgstr "̵¸ú¤Ê½ð̾%d¸Ä\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
-msgstr "¸°¤¬Ìµ¤¤¤Î¤Ç 1 ¸Ä¤Î½ð̾¤Ï¸¡¾Ú¤Ç¤­¤Þ¤»¤ó\n"
+msgstr "¸°¤¬¤Ê¤¤¤¿¤á1¸Ä¤Î½ð̾¤ò¸¡¾Ú¤·¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
-msgstr "¸°¤¬Ìµ¤¤¤Î¤Ç %d ¸Ä¤Î½ð̾¤Ï¸¡¾Ú¤Ç¤­¤Þ¤»¤ó\n"
+msgstr "¸°¤¬¤Ê¤¤¤¿¤á%d¸Ä¤Î½ð̾¤ò¸¡¾Ú¤·¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
-msgstr "¸°¤¬Ìµ¤¤¤Î¤Ç 1 ¸Ä¤Î½ð̾¤Ï¸¡¾Ú¤Ç¤­¤Þ¤»¤ó\n"
+msgstr "¥¨¥é¡¼¤Î¤¿¤á1¸Ä¤Î½ð̾¤ò¸¡¾Ú¤·¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
-msgstr "%d ¸Ä¤Î½ð̾¤Ï¥¨¥é¡¼¤Ë¤è¤ê¸¡¾Ú¤µ¤ì¤Þ¤»¤ó\n"
+msgstr "¥¨¥é¡¼¤Î¤¿¤á%d¸Ä¤Î½ð̾¤ò¸¡¾Ú¤·¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
-msgstr "Í­¸ú¤Ê¼«¸Ê½ð̾¤Î̵¤¤¥æ¡¼¥¶ ID ¤¬ 1 ¸Ä¤¢¤ê¤Þ¤¹\n"
+msgstr "Í­¸ú¤Ê¼«¸Ê½ð̾¤Î¤Ê¤¤¥æ¡¼¥¶¡¼ID¤ò1¸Ä¸¡½Ð\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
-msgstr "Í­¸ú¤Ê¼«¸Ê½ð̾¤Î̵¤¤¥æ¡¼¥¶ ID ¤¬ %d ¸Ä¤¢¤ê¤Þ¤¹\n"
+msgstr "Í­¸ú¤Ê¼«¸Ê½ð̾¤Î¤Ê¤¤¥æ¡¼¥¶¡¼ID¤ò%d¸Ä¸¡½Ð\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
-msgstr "¸° %08lX ¤Ë¤è¤Ã¤Æ´û¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
+msgstr "¸°%08lX¤Ç¤â¤¦½ð̾¤·¤Æ¤¢¤ê¤Þ¤¹\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
-msgstr "¸° %08lX ¤Ë¤è¤Ã¤Æ½ð̾¤¹¤ë¤â¤Î¤Ï¤¢¤ê¤Þ¤»¤ó\n"
+msgstr "¸°%08lX¤Ç½ð̾¤¹¤ë¤â¤Î¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
-msgstr "ËÜÅö¤Ë ¤³¤Î¸°¤Ë¤¢¤Ê¤¿¤Î¸°¤Ç½ð̾¤·¤ÆÎɤ¤¤Ç¤¹¤«: \""
+msgstr "ËÜÅö¤Ë¤³¤Î¸°¤Ë¤¢¤Ê¤¿¤Î¸°¤Ç½ð̾¤·¤Æ¤è¤¤¤Ç¤¹¤«: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
 msgstr ""
-"½ð̾¤Ï½ñ¤­½Ð¤·ÉԲĤËÀßÄꤵ¤ì¤Þ¤¹¡£\n"
+"½ð̾¤Ï½ñ½Ð¤·ÉԲĤËÀßÄꤵ¤ì¤Þ¤¹¡£\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "ËÜÅö¤Ë½ð̾¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "½ð̾¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "¤³¤Î¸°¤ÏÊݸ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:431
-#, fuzzy
+#: g10/keyedit.c:432
 msgid "Secret parts of primary key are not available.\n"
-msgstr "ÈëÌ©¸°¤¬¤¢¤ê¤Þ¤»¤ó"
+msgstr "¼ç¸°¤ÎÈëÌ©Éôʬ¤¬ÆÀ¤é¤ì¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "¸°¤ÏÊݸ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
-msgstr "¤³¤Î¸°¤òÊÔ½¸¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó: %s\n"
+msgstr "¤³¤Î¸°¤ÏÊÔ½¸¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
-"¤³¤ÎÈëÌ©¸°¤ËÂФ¹¤ë¿·¤·¤¤¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎϤ·¤Æ²¼¤µ¤¤¡£\n"
+"¤³¤ÎÈëÌ©¸°¤Î¿·¤·¤¤¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
-"¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬ÉÔɬÍפʤ褦¤Ç¤¹¤¬¡¢¤½¤ì¤Ï°­¤¤¹Í¤¨¤Ç¤¹!\n"
+"¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬ÉÔɬÍפʤ褦¤Ç¤¹¤¬¡¢\n"
+"¤ª¤½¤é¤¯¤½¤ì¤Ï¤í¤¯¤Ê¹Í¤¨¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "ËÜÅö¤Ë¼Â¹Ô¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr "¸°¤Î½ð̾¤òÀµ¤·¤¤¾ì½ê¤Ë°ÜÆ°¤·¤Þ¤¹\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "¤³¤Î¥á¥Ë¥å¡¼¤ò½ªÎ»"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "Êݸ¤·¤Æ½ªÎ»"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "¤³¤Î¥Ø¥ë¥×¤ò¸«¤ë"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr "»ØÌæ¤ò¸«¤ë"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
-msgstr "¸°¤È¥æ¡¼¥¶ ID ¤Î°ìÍ÷"
+msgstr "¸°¤È¥æ¡¼¥¶¡¼ID¤Î°ìÍ÷"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
-msgstr "¥æ¡¼¥¶ ID N ¤ÎÁªÂò"
+msgstr "¥æ¡¼¥¶¡¼ID N¤ÎÁªÂò"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
-msgstr "Éû¸° N ¤ÎÁªÂò"
+msgstr "Éû¸°N¤ÎÁªÂò"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr "½ð̾¤Î°ìÍ÷"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr "¸°¤Ø½ð̾"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
-msgstr "¸°¤Ë½ñ¤­½Ð¤·ÉԲĤʽð̾"
+msgstr "¸°¤ØÆâÉôŪ¤Ë½ð̾"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
-msgstr "¥æ¡¼¥¶ ID ¤ÎÄɲÃ"
+msgstr "¥æ¡¼¥¶¡¼ID¤ÎÄɲÃ"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
-msgstr "¥æ¡¼¥¶ ID ¤Î¾Ãµî"
+msgstr "¥æ¡¼¥¶¡¼ID¤Îºï½ü"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr "Éû¸°¤ÎÄɲÃ"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "Éû¸°¤Îºï½ü"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
 msgstr "½ð̾¤Îºï½ü"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr "Í­¸ú´ü¸Â¤ÎÊѹ¹"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
-msgstr "ÈëÌ©¸°¤È¸ø³«¸°°ìÍ÷¤ÎÀÚ¤êÂؤ¨"
+msgstr "ÈëÌ©¸°¤È¸ø³«¸°¤Î°ìÍ÷¤ÎÀÚÂؤ¨"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606 g10/keyedit.c:607
 msgid "list preferences"
 msgstr "Í¥Àè½ç°Ì¤Î°ìÍ÷"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "pref"
+
+#: g10/keyedit.c:608
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:608
 msgid "change the passphrase"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÎÊѹ¹"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "change the ownertrust"
-msgstr "¼«¸Ê½ð̾¤ÎÊѹ¹"
+msgstr "½êÍ­¼Ô¿®ÍѤÎÊѹ¹"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revoke signatures"
 msgstr "½ð̾¤ÎÇË´þ"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revoke a secondary key"
 msgstr "Éû¸°¤ÎÇË´þ"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable a key"
-msgstr "¸°¤ò»ÈÍÑÉԲĤˤ¹¤ë"
+msgstr "¸°¤Î»ÈÍѤò¶Ø»ß¤¹¤ë"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable a key"
-msgstr "¸°¤ò»ÈÍѲĤˤ¹¤ë"
+msgstr "¸°¤Î»ÈÍѤòµö²Ä¤¹¤ë"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:633
 msgid "can't do that in batchmode\n"
-msgstr "¤½¤ì¤Ï¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤Ï¼Â¹Ô¤Ç¤­¤Þ¤»¤ó\n"
+msgstr "¤½¤ì¤Ï¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤Ï¤Ç¤­¤Þ¤»¤ó\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:669
+#: g10/keyedit.c:671
 msgid "Secret key is available.\n"
-msgstr "ÈëÌ©¸°¤¬»ÈÍѤǤ­¤Þ¤¹\n"
+msgstr "ÈëÌ©¸°¤¬»ÈÍѤǤ­¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:700
 msgid "Command> "
 msgstr "¥³¥Þ¥ó¥É> "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 msgid "Need the secret key to do this.\n"
-msgstr "¤³¤ì¤ò¼Â¹Ô¤¹¤ë¤Ë¤ÏÈëÌ©¸°¤¬É¬ÍפǤ¹¡£\n"
+msgstr "¤³¤Î¼Â¹Ô¤Ë¤ÏÈëÌ©¸°¤¬¤¤¤ê¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Please use the command \"toggle\" first.\n"
-msgstr ""
+msgstr "¤Þ¤º¡Ötoggle¡×¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:781
 msgid "Really sign all user IDs? "
-msgstr "Á´¤Æ¤Î¥æ¡¼¥¶ ID ¤Ë ËÜÅö¤Ë ½ð̾¤·¤Þ¤¹¤«? "
+msgstr "ËÜÅö¤ËÁ´¥æ¡¼¥¶¡¼ID¤Ë½ð̾¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:782
 msgid "Hint: Select the user IDs to sign\n"
-msgstr "¥Ò¥ó¥È: ½ð̾¤¹¤ë¥æ¡¼¥¶ ID  ¤òÁªÂò\n"
+msgstr "¥³¥Ä: ¤Þ¤º½ð̾¤¹¤ë¥æ¡¼¥¶¡¼ID¤òÁªÂò¤·¤Þ¤¹\n"
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:814 g10/keyedit.c:1000
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:825 g10/keyedit.c:846
 msgid "You must select at least one user ID.\n"
-msgstr "¾¯¤Ê¤¯¤È¤â 1 ¸Ä¤Î¥æ¡¼¥¶ ID ¤òÁªÂò¤·¤Æ²¼¤µ¤¤¡£\n"
+msgstr "¥æ¡¼¥¶¡¼ID¤ò¾¯¤Ê¤¯¤È¤â¤Ò¤È¤ÄÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:827
 msgid "You can't delete the last user ID!\n"
-msgstr "ºÇ¸å¥æ¡¼¥¶ ID ¤Î½ð̾¤Ïºï½ü¤Ç¤­¤Þ¤»¤ó\n"
+msgstr "ºÇ¸å¤Î¥æ¡¼¥¶¡¼ID¤Ïºï½ü¤Ç¤­¤Þ¤»¤ó!\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:830
 msgid "Really remove all selected user IDs? "
-msgstr "ÁªÂò¤·¤¿¥æ¡¼¥¶ ID ¤ò ËÜÅö¤Ë ºï½ü¤·¤Þ¤¹¤«? "
+msgstr "ÁªÂò¤·¤¿Á´¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:831
 msgid "Really remove this user ID? "
-msgstr "¤³¤Î¥æ¡¼¥¶ ID ¤ò ËÜÅö¤Ë ºï½ü¤·¤Þ¤¹¤«? "
+msgstr "¤³¤Î¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:867 g10/keyedit.c:889
 msgid "You must select at least one key.\n"
-msgstr "¾¯¤Ê¤¯¤È¤â 1 ¸Ä¤Î¸°¤òÁªÂò¤·¤Æ²¼¤µ¤¤¡£\n"
+msgstr "¸°¤ò¾¯¤Ê¤¯¤È¤â¤Ò¤È¤ÄÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:871
 msgid "Do you really want to delete the selected keys? "
-msgstr "ÁªÂò¤·¤¿¸°¤ò ËÜÅö¤Ë ºï½ü¤·¤Þ¤¹¤«? "
+msgstr "ÁªÂò¤·¤¿¸°¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:872
 msgid "Do you really want to delete this key? "
-msgstr "¤³¤Î¸°¤ò ËÜÅö¤Ë ºï½ü¤·¤Þ¤¹¤«? "
+msgstr "¤³¤Î¸°¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke the selected keys? "
-msgstr "ÁªÂò¤·¤¿¸°¤ò ËÜÅö¤Ë ÇË´þ¤·¤Þ¤¹¤«? "
+msgstr "ÁªÂò¤·¤¿¸°¤òËÜÅö¤ËÇË´þ¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:894
 msgid "Do you really want to revoke this key? "
-msgstr "¤³¤Î¸°¤ò ËÜÅö¤Ë ÇË´þ¤·¤Þ¤¹¤«? "
+msgstr "¤³¤Î¸°¤òËÜÅö¤ËÇË´þ¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
 msgid "Save changes? "
 msgstr "Êѹ¹¤òÊݸ¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:967
 msgid "Quit without saving? "
 msgstr "Êݸ¤»¤º¤Ë½ªÎ»¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:978
 #, c-format
 msgid "update failed: %s\n"
-msgstr "¹¹¿·¤Ë¼ºÇÔ: %s\n"
+msgstr "¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:985
 #, c-format
 msgid "update secret failed: %s\n"
-msgstr "ÈëÌ©¸°¤Î¹¹¿·¤Ë¼ºÇÔ: %s\n"
+msgstr "ÈëÌ©¸°¤Î¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:992
 msgid "Key not changed so no update needed.\n"
-msgstr "¸°¤ÏÊѹ¹¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¤Î¤Ç¹¹¿·¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£\n"
+msgstr "¸°¤Ï̵Êѹ¹¤Ê¤Î¤Ç¹¹¿·¤Ï¤¤¤ê¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1007
 msgid "Invalid command  (try \"help\")\n"
-msgstr "̵¸ú¤Ê¥³¥Þ¥ó¥É (\"help\" ¤ò¸«¤è)\n"
+msgstr "̵¸ú¤Ê¥³¥Þ¥ó¥É (¡Öhelp¡×¤ò»²¾È)\n"
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
-msgstr ""
+msgstr "%s%c %4u%c/%08lX  ºîÀ®: %s ´ü¸Â: %s"
 
-#: g10/keyedit.c:1090
+#: g10/keyedit.c:1140
 #, c-format
 msgid " trust: %c/%c"
-msgstr ""
+msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1144
 msgid "This key has been disabled"
-msgstr "¤³¤Î¸°¤Ï»ÈÍÑÉԲĤËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹"
+msgstr "¤³¤Î¸°¤Ï»ÈÍѶػߤËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: g10/keyedit.c:1123
-#, fuzzy, c-format
+#: g10/keyedit.c:1173
+#, c-format
 msgid "rev! subkey has been revoked: %s\n"
-msgstr "¸° %08lX: Éû¸°¤ÏÇË´þºÑ¤ß¤Ç¤¹!\n"
+msgstr "rev! Éû¸°¤ÏÇË´þºÑ¤ß¤Ç¤¹: %s\n"
 
-#: g10/keyedit.c:1126
-#, fuzzy
+#: g10/keyedit.c:1176
 msgid "rev- faked revocation found\n"
-msgstr "        ¿·¤¿¤Ê¸°¤ÎÇË´þ: %lu\n"
+msgstr "rev- ¤Ç¤Ã¤Á¤¢¤²¤ÎÇË´þ¤òȯ¸«\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1178
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
-msgstr ""
+msgstr "rev? ÇË´þ³Îǧ¾ã³²: %s\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1420
 msgid "Delete this good signature? (y/N/q)"
 msgstr "¤³¤ÎÀµ¤·¤¤½ð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1424
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "¤³¤Î̵¸ú¤Ê½ð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1428
 msgid "Delete this unknown signature? (y/N/q)"
-msgstr "¤³¤ÎÉÔÌÀ¤Ê½ð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)"
+msgstr "¤³¤Î̤ÃΤνð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1434
 msgid "Really delete this self-signature? (y/N)"
-msgstr "¤³¤Î¼«¸Ê½ð̾¤ò ËÜÅö¤Ë ºï½ü¤·¤Þ¤¹¤«? (y/N)"
+msgstr "¤³¤Î¼«¸Ê½ð̾¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N)"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1448
 #, c-format
 msgid "Deleted %d signature.\n"
-msgstr "%d ¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n"
+msgstr "%d¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1449
 #, c-format
 msgid "Deleted %d signatures.\n"
-msgstr "%d ¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n"
+msgstr "%d¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1452
 msgid "Nothing deleted.\n"
 msgstr "²¿¤âºï½ü¤·¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1521
 msgid "Please remove selections from the secret keys.\n"
-msgstr "ÈëÌ©¸°¤ÎÁªÂò¤òºï½ü¤·¤Æ²¼¤µ¤¤¡£\n"
+msgstr "ÈëÌ©¸°¤ÎÁªÂò¤ò¤È¤¤¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1527
 msgid "Please select at most one secondary key.\n"
-msgstr "¿¤¯¤Æ¤â 1 ¸Ä¤ÎÉû¸°¤òÁªÂò¤·¤Æ²¼¤µ¤¤¡£\n"
+msgstr "¹â¡¹1¸Ä¤ÎÉû¸°¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1531
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Éû¸°¤ÎÍ­¸ú´ü¸Â¤òÊѹ¹¤·¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "¼ç¸°¤ÎÍ­¸ú´ü¸Â¤òÊѹ¹¤·¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1575
 msgid "You can't change the expiration date of a v3 key\n"
-msgstr "v3 ¸°¤ÎÍ­¸ú´ü¸Â¤òÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹\n"
+msgstr "v3¸°¤ÎÍ­¸ú´ü¸Â¤ÏÊѹ¹¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1591
 msgid "No corresponding signature in secret ring\n"
-msgstr "ÈëÌ©¸°¥ê¥ó¥°¤ËÂбþ¤¹¤ë½ð̾¤¬¤¢¤ê¤Þ¤»¤ó\n"
+msgstr "ÈëÌ©¸°ÎؤËÂбþ¤¹¤ë½ð̾¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1652
 #, c-format
 msgid "No user ID with index %d\n"
-msgstr "%d È֤Υ桼¥¶ ID ¤Ï¤¢¤ê¤Þ¤»¤ó\n"
+msgstr "%dÈ֤Υ桼¥¶¡¼ID¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1698
 #, c-format
 msgid "No secondary key with index %d\n"
-msgstr "%d ÈÖ¤ÎÉû¸°¤Ï¤¢¤ê¤Þ¤»¤ó\n"
+msgstr "%dÈÖ¤ÎÉû¸°¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1796
 msgid "user ID: \""
-msgstr "¥æ¡¼¥¶ ID: \""
+msgstr "¥æ¡¼¥¶¡¼ID: \""
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1799
 #, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr ""
 "\"\n"
-"¤¢¤Ê¤¿¤Î¸° %08lX ¤Ç %s ¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
+"¤¢¤Ê¤¿¤Î¸°%08lX¤Ç%s¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1803
 msgid "Create a revocation certificate for this signature? (y/N)"
-msgstr "¤³¤Î½ð̾¤ËÂФ¹¤ëÇË´þ¾ÚÌÀ½ñ¤òºîÀ®¤·¤Þ¤¹¤«? (y/N)"
+msgstr "¤³¤Î½ð̾¤Ë¤¿¤¤¤¹¤ëÇË´þ¾ÚÌÀ½ñ¤òºî¤ê¤Þ¤¹¤«? (y/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1827
 msgid "You have signed these user IDs:\n"
-msgstr "¤³¤ì¤é¤Î¥æ¡¼¥¶ ID ¤Ë½ð̾¤·¤Þ¤·¤¿:\n"
+msgstr "¤³¤ì¤é¤Î¥æ¡¼¥¶¡¼ID¤Ë½ð̾¤·¤Þ¤·¤¿:\n"
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
 #, c-format
 msgid "   signed by %08lX at %s\n"
-msgstr "   %08lX ¤Ë¤è¤Ã¤Æ %s ¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
+msgstr "   %08lX¤Ç%s¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1846
 #, c-format
 msgid "   revoked by %08lX at %s\n"
-msgstr "   %08lX ¤Ë¤è¤Ã¤Æ %s ¤ËÇË´þ¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
+msgstr "   %08lX¤Ç%s¤ËÇË´þ¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1866
 msgid "You are about to revoke these signatures:\n"
-msgstr "¤¢¤Ê¤¿¤Ï¤³¤ì¤é¤Î½ð̾¤òÇË´þ¤¹¤ë¤«Ì¤äƤ¤¤Þ¤¹:\n"
+msgstr "¤³¤ì¤é¤Î½ð̾¤òÇË´þ¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹:\n"
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1884
 msgid "Really create the revocation certificates? (y/N)"
-msgstr "ÇË´þ¾ÚÌÀ½ñ¤ò ËÜÅö¤Ë ºîÀ®¤·¤Þ¤¹¤«? (y/N)"
+msgstr "ÇË´þ¾ÚÌÀ½ñ¤òËÜÅö¤Ëºî¤ê¤Þ¤¹¤«? (y/N)"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1913
 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:400 g10/mainproc.c:790
-#, fuzzy, c-format
+#: g10/keylist.c:279 g10/mainproc.c:851
+#, c-format
 msgid " [expires: %s]"
-msgstr "¸°¤Ï %s ¤Ë¤Æ´ü¸ÂÀÚ¤ì¤Ë¤Ê¤ê¤Þ¤¹\n"
+msgstr " [Í­¸ú´ü¸Â: %s]"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:269
 #, c-format
 msgid "public key is %08lX\n"
-msgstr "¸ø³«¸°¤Ï %08lX ¤Ç¤¹\n"
+msgstr "¸ø³«¸°¤Ï%08lX¤Ç¤¹\n"
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:314
 msgid "public key encrypted data: good DEK\n"
-msgstr "¸ø³«¸°¤Ç°Å¹æ²½¤µ¤ì¤¿¥Ç¡¼¥¿: Àµ¤·¤¤ DEK ¤Ç¤¹\n"
+msgstr "¸ø³«¸°¤Ç°Å¹æ²½¤µ¤ì¤¿¥Ç¡¼¥¿: Àµ¤·¤¤DEK¤Ç¤¹\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:366
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
-msgstr "%u ¥Ó¥Ã¥È %s ¸°, ID %08lX ¤Ë¤è¤Ã¤Æ°Å¹æ²½¤µ¤ì¤Þ¤·¤¿ %s\n"
+msgstr "%u-¥Ó¥Ã¥È%s¸°, ID %08lX¤Ç°Å¹æ²½%s¤Ë¤Ç¤­¤Þ¤·¤¿\n"
 
-#: g10/mainproc.c:336
+#: g10/mainproc.c:376
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
-msgstr "%s ¸°, ID %08lX ¤Ë¤è¤Ã¤Æ°Å¹æ²½¤µ¤ì¤Þ¤·¤¿\n"
-
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr "Éü¹æ¤ËɬÍפÊÈëÌ©¸°¤¬¤¢¤ê¤Þ¤»¤ó\n"
+msgstr "%s¸°, ID %08lX¤Ç°Å¹æ²½¤µ¤ì¤Þ¤·¤¿\n"
 
-#: g10/mainproc.c:351
+#: g10/mainproc.c:390
 #, c-format
 msgid "public key decryption failed: %s\n"
-msgstr "¸ø³«¸°¤ÎÉü¹æ¤Ë¼ºÇÔ: %s\n"
+msgstr "¸ø³«¸°¤ÎÉü¹æ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:430
 msgid "decryption okay\n"
 msgstr "Éü¹æ¤ËÀ®¸ù\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:435
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "·Ù¹ð: °Å¹æ²½¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤Ï²þã⤵¤ì¤Æ¤¤¤Þ¤¹!\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:440
 #, c-format
 msgid "decryption failed: %s\n"
-msgstr "Éü¹æ¤Ë¼ºÇÔ: %s\n"
+msgstr "Éü¹æ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:459
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
-msgstr "Ãí°Õ: Á÷¿®¼Ô¤Ï¡ÖÆɤ߽ª¤¨¤¿¤éºï½ü¤¹¤ë¡×¤è¤¦¤Ëµá¤á¤Æ¤¤¤Þ¤¹\n"
+msgstr "Ãí°Õ: Á÷¿®¼Ô¤Ï¡ÖÆâ½ï¤Ë¤¹¤ë¡×¤è¤¦¤Ëµá¤á¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:461
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "¸µ¤Î¥Õ¥¡¥¤¥ë̾='%.*s'\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:632
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "ÆÈΩÇË´þ¡£¡Ögpg --import¡×¤ò»È¤Ã¤ÆŬÍѤ·¤Æ¤¯¤À¤µ¤¤\n"
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:719 g10/mainproc.c:728
 msgid "WARNING: invalid notation data found\n"
 msgstr "·Ù¹ð: ̵¸ú¤ÊÃí¼á¥Ç¡¼¥¿¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:731
 msgid "Notation: "
 msgstr "Ãí¼á: "
 
-#: g10/mainproc.c:680
+#: g10/mainproc.c:740
 msgid "Policy: "
 msgstr "¥Ý¥ê¥·¡¼: "
 
-#: g10/mainproc.c:1121
+#: g10/mainproc.c:1193
 msgid "signature verification suppressed\n"
-msgstr "½ð̾¤Î¸¡¾Ú¤¬¤Ç¤­¤Þ¤»¤ó\n"
+msgstr "½ð̾¤Î¸¡¾Ú¤ò¾Êά\n"
 
-#: g10/mainproc.c:1158
+#. plaintext before signatures but no one-pass packets
+#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#, fuzzy
+msgid "can't handle these multiple signatures\n"
+msgstr "ʬΥ½ð̾¤òºîÀ®"
+
+#: g10/mainproc.c:1256
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
-msgstr "%.*s ¤Î %s ¸° ID %08lX ¤Ë¤è¤ë½ð̾\n"
+msgstr "%.*s ¤Î%s¸°ID %08lX¤Ë¤è¤ë½ð̾\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1184 g10/mainproc.c:1195
+#: g10/mainproc.c:1284 g10/mainproc.c:1292
 msgid "BAD signature from \""
-msgstr "ÉÔÀµ¤Ê½ð̾: \""
+msgstr "ÉÔÀµ¤Ê ½ð̾: \""
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1196
+#: g10/mainproc.c:1285 g10/mainproc.c:1293
 msgid "Good signature from \""
 msgstr "Àµ¤·¤¤½ð̾: \""
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1308
 msgid "                aka \""
-msgstr "                ÊÌ̾ \""
+msgstr "       ÊÌ̾ \""
 
-#: g10/mainproc.c:1243
+#: g10/mainproc.c:1358
 #, c-format
 msgid "Can't check signature: %s\n"
-msgstr "½ð̾¤Î¸¡¾Ú¤¬¤Ç¤­¤Þ¤»¤ó: %s\n"
+msgstr "½ð̾¤ò¸¡¾Ú¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: g10/mainproc.c:1318
+#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "ʬΥ½ð̾¤òºîÀ®"
+
+#: g10/mainproc.c:1454
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "¥¯¥é¥¹0x%02x¤ÎÆÈΩ½ð̾\n"
 
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1511
 msgid "old style (PGP 2.x) signature\n"
-msgstr "¸Å¤¤·Á¼° (PGP 2.x) ¤Ë¤è¤ë½ð̾\n"
+msgstr "¸Å¤¤·Á¼° (PGP 2.x) ¤Î½ð̾\n"
 
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1518
 msgid "invalid root packet detected in proc_tree()\n"
-msgstr "proc_tree() ¤ÎÃæ¤Ë̵¸ú¤Ê¥Ñ¥±¥Ã¥È¤¬¸¡½Ð¤µ¤ì¤Þ¤·¤¿\n"
+msgstr "proc_tree() ¤ÎÃæ¤Ë̵¸ú¤Ê¥Ñ¥±¥Ã¥È¤ò¸¡½Ð¤·¤Þ¤·¤¿\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, c-format
 msgid "can't disable core dumps: %s\n"
-msgstr "¥³¥¢¥À¥ó¥×¤ò̵¸ú¤Ë¤Ç¤­¤Þ¤»¤ó: %s\n"
+msgstr "¥³¥¢¡¦¥À¥ó¥×¤ò̵¸ú¤Ë¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr "¼Â¸³Ãæ¤Î¥¢¥ë¥´¥ê¥º¥à¤Ï»ÈÍѤ¹¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!\n"
 
-#: g10/misc.c:234
-msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
-msgstr "¤³¤Î°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤ÏÈ¿ÂФµ¤ì¤Æ¤¤¤Þ¤¹¡£°ìÈÌŪ¤ÊÊýË¡¤òÍѤ¤¤Æ²¼¤µ¤¤!\n"
+#: g10/misc.c:238
+#, fuzzy
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+msgstr ""
+"¤³¤Î°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤ÏÈ¿ÂФµ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
+"¤â¤Ã¤Èɸ½àŪ¤Ê¥¢¥ë¥´¥ê¥º¥à¤òÍѤ¤¤Æ¤¯¤À¤µ¤¤!\n"
 
 #: g10/parse-packet.c:119
 #, c-format
 msgid "can't handle public key algorithm %d\n"
-msgstr "¸ø³«¸°¤Î¥¢¥ë¥´¥ê¥º¥à %d ¤Ï»ÈÍѤǤ­¤Þ¤»¤ó\n"
+msgstr "¸ø³«¸°¤Î¥¢¥ë¥´¥ê¥º¥à%d¤Ï»ÈÍѤǤ­¤Þ¤»¤ó\n"
 
-#: g10/parse-packet.c:991
+#: g10/parse-packet.c:1010
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
-msgstr "subpacket of type %d has critical bit set\n"
+msgstr "¥¿¥¤¥×%d¤Î²¼°Ì¥Ñ¥±¥Ã¥È¤Ë¥¯¥ê¥Æ¥£¥«¥ë¡¦¥Ó¥Ã¥È¤òȯ¸«\n"
+
+#: g10/passphrase.c:223
+msgid "gpg-agent is not available in this session\n"
+msgstr ""
+
+#: g10/passphrase.c:229
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr ""
+
+#: g10/hkp.c:167 g10/passphrase.c:248
+#, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "`%s'¤ØÀܳ¤Ç¤­¤Þ¤»¤ó: %s\n"
+
+#: g10/passphrase.c:313 g10/passphrase.c:576
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr " (¼ç¸°ID %08lX)"
 
-#: g10/passphrase.c:159
+#: g10/passphrase.c:323
+#, fuzzy, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"\n"
+"¼¡¤Î¥æ¡¼¥¶¡¼¤ÎÈëÌ©¸°¤Î¥í¥Ã¥¯¤ò²ò½ü¤¹¤ë¤Ë¤Ï\n"
+"¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹: \""
+
+#: g10/passphrase.c:344
+#, fuzzy
+msgid "Enter passphrase\n"
+msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎÏ: "
+
+#: g10/passphrase.c:346
+#, fuzzy
+msgid "Repeat passphrase\n"
+msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òºÆÆþÎÏ: "
+
+#: g10/passphrase.c:384
+msgid "passphrase too long\n"
+msgstr ""
+
+#: g10/passphrase.c:396
+msgid "invalid response from agent\n"
+msgstr ""
+
+#: g10/passphrase.c:405
+msgid "cancelled by user\n"
+msgstr ""
+
+#: g10/passphrase.c:408 g10/passphrase.c:477
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr ""
+
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
 "user: \""
 msgstr ""
 "\n"
-"¼¡¤Î¥æ¡¼¥¶¤Î¥í¥Ã¥¯¤ò²ò½ü¤¹¤ë¤Ë¤Ï¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬É¬ÍפǤ¹\n"
-"¥æ¡¼¥¶: \""
+"¼¡¤Î¥æ¡¼¥¶¡¼¤ÎÈëÌ©¸°¤Î¥í¥Ã¥¯¤ò²ò½ü¤¹¤ë¤Ë¤Ï\n"
+"¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹: \""
 
-#: g10/passphrase.c:168
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
-msgstr "%u ¥Ó¥Ã¥È %s ¸°, ID %08lX ¤¬ºîÀ®¤µ¤ì¤Þ¤·¤¿ %s"
-
-#: g10/passphrase.c:173
-#, c-format
-msgid " (main key ID %08lX)"
-msgstr " (¼ç¸° ID %08lX)"
+msgstr "%u¥Ó¥Ã¥È%s¸°, ID %08lXºîÀ®ÆüÉÕ¤Ï%s"
 
-#: g10/passphrase.c:190
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
-msgstr "¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤Ï¥Ñ¥¹¥ï¡¼¥É¤ÎÌ䤤¹ç¤ï¤»¤¬¤Ç¤­¤Þ¤»¤ó\n"
+msgstr "¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤Ï¥Ñ¥¹¥ï¡¼¥É¤ÎÌä¹ç¤»¤¬¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/passphrase.c:194
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎÏ: "
 
-#: g10/passphrase.c:198
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òºÆÆþÎÏ: "
 
 #: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
-"¥Ç¡¼¥¿¤ÏÊݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£Êݸ¤¹¤ë¤Ë¤Ï \"--output\" "
-"¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ²¼¤µ¤¤¡£\n"
+"¥Ç¡¼¥¿¤ÏÊݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
+"Êݸ¤¹¤ë¤Ë¤Ï¡Ö--output¡×¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤\n"
 
-#: g10/plaintext.c:324
+#: g10/plaintext.c:332
 msgid "Detached signature.\n"
 msgstr "ʬΥ½ð̾¡£\n"
 
-#: g10/plaintext.c:328
+#: g10/plaintext.c:336
 msgid "Please enter name of data file: "
-msgstr "¥Ç¡¼¥¿¥Õ¥¡¥¤¥ë¤Î̾Á°¤òÆþÎÏ: "
+msgstr "¥Ç¡¼¥¿¡¦¥Õ¥¡¥¤¥ë¤Î̾Á°¤òÆþÎÏ: "
 
-#: g10/plaintext.c:349
+#: g10/plaintext.c:357
 msgid "reading stdin ...\n"
-msgstr "ɸ½àÆþÎϤè¤êÆɤ߹þ¤ßÃæ ...\n"
+msgstr "ɸ½àÆþÎϤè¤êÆɹþ¤ßÃæ ...\n"
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:391
+#, fuzzy
+msgid "no signed data\n"
+msgstr "½ð̾¤µ¤ì¤¿¥Ç¡¼¥¿`%s'¤¬³«¤±¤Þ¤»¤ó\n"
+
+#: g10/plaintext.c:399
 #, c-format
 msgid "can't open signed data `%s'\n"
-msgstr "½ð̾¤µ¤ì¤¿¥Ç¡¼¥¿ `%s' ¤¬³«¤±¤Þ¤»¤ó\n"
+msgstr "½ð̾¤µ¤ì¤¿¥Ç¡¼¥¿`%s'¤¬³«¤±¤Þ¤»¤ó\n"
 
 #: g10/pubkey-enc.c:76
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
-msgstr "ÉÔÆÃÄê¤Î¼õ¿®¼ÔÍѤǤ¹¡£ÈëÌ©¸° %08lX ¤òÍѤ¤¤Þ¤¹ ...\n"
+msgstr "ƿ̾¤Î¼õ¿®¼ÔÍѤǤ¹¡£ÈëÌ©¸°%08lX¤òÍѤ¤¤Þ¤¹ ...\n"
 
 #: g10/pubkey-enc.c:82
 msgid "okay, we are the anonymous recipient.\n"
-msgstr "½ªÎ»¡£ÉÔÆÃÄê¤Î¼õ¿®¼ÔÍѤǤ¹¡£\n"
+msgstr "½ªÎ»¡£Æ¿Ì¾¤Î¼õ¿®¼ÔÍѤǤ¹¡£\n"
 
 #: g10/pubkey-enc.c:134
 msgid "old encoding of the DEK is not supported\n"
-msgstr "DEK ¤Ë¤è¤ëµì¼°¤Î°Å¹æ¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
+msgstr "DEK¤Ë¤è¤ëµì¼°¤Î°Å¹æ¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
 #: g10/pubkey-enc.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
-msgstr "Êݸ¥ë¥´¥ê¥º¥à %d ¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
+msgstr "Êݸ¥ë¥´¥ê¥º¥à%d¤Ï̤ÃΤ«»ÈÍÑÉԲĤǤ¹\n"
 
 #: g10/pubkey-enc.c:192
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
-msgstr "Ãí°Õ: °Å¹æ¥¢¥ë¥´¥ê¥º¥à %d ¤ÏÍ¥Àè½ç¤ËÆþ¤Ã¤Æ¤¤¤Þ¤»¤ó\n"
+msgstr "Ãí°Õ: °Å¹æ¥¢¥ë¥´¥ê¥º¥à%d¤ÏÍ¥Àè½ç¤ËÆþ¤Ã¤Æ¤¤¤Þ¤»¤ó\n"
 
 #: g10/pubkey-enc.c:198
-#, fuzzy, c-format
+#, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
-msgstr "Ãí°Õ: ½ð̾¤Î¸°¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹ %s\n"
+msgstr "Ãí°Õ: ÈëÌ©¸°%08lX¤Ï%s¤Ç´ü¸ÂÀÚ¤ì¤Ç¤¹\n"
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
-msgstr ""
+msgstr "¸°%08lX¤ò%s¤ËÍ×µá ...\n"
 
-#: g10/hkp.c:85
-#, fuzzy, c-format
+#: g10/hkp.c:83
+#, c-format
 msgid "can't get key from keyserver: %s\n"
-msgstr "¸°¥µ¡¼¥Ð¡¼¤«¤é¸°¤òÆɤ߹þ¤à"
+msgstr "¸°¥µ¡¼¥Ð¡¼¤«¤é¸°¤òÆɤ߹þ¤á¤Þ¤»¤ó: %s\n"
 
-#: g10/hkp.c:109 g10/hkp.c:148
+#: g10/hkp.c:102 g10/hkp.c:136
 msgid "no keyserver known (use option --keyserver)\n"
-msgstr ""
+msgstr "´ûÃΤθ°¥µ¡¼¥Ð¡¼¤Ï¤¢¤ê¤Þ¤»¤ó (--keyserver¥ª¥×¥·¥ç¥ó¤ò»È¤¤¤Þ¤·¤ç¤¦)\n"
 
-#: g10/hkp.c:117
-#, fuzzy, c-format
+#: g10/hkp.c:110
+#, c-format
 msgid "%s: not a valid key ID\n"
-msgstr "%s ¤ÏÀµ¤·¤¤Ê¸»ú¥³¡¼¥É¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
+msgstr "%s: Àµ¤·¤¤¸°ID¤Ç¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/hkp.c:170
-#, fuzzy, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "`%s' ¤¬³«¤±¤Þ¤»¤ó: %s\n"
-
-#: g10/hkp.c:194
-#, fuzzy, c-format
+#: g10/hkp.c:191
+#, c-format
 msgid "error sending to `%s': %s\n"
-msgstr "`%s' ¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ: %s\n"
+msgstr "`%s'¤Ø¤ÎÁ÷¿®¥¨¥é¡¼: %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:203
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
-msgstr ""
+msgstr "`%s'¤Ø¤ÎÁ÷¿®¤ËÀ®¸ù (¾õÂÖ=%u)\n"
 
-#: g10/hkp.c:209
+#: g10/hkp.c:206
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
-msgstr ""
+msgstr "`%s'¤Ø¤ÎÁ÷¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: ¾õÂÖ=%u\n"
 
 #: g10/seckey-cert.c:53
-#, fuzzy
 msgid "secret key parts are not available\n"
-msgstr "ÈëÌ©¸°¤¬¤¢¤ê¤Þ¤»¤ó"
+msgstr "ÈëÌ©Éôʬ¤¬ÆÀ¤é¤ì¤Þ¤»¤ó\n"
 
 #: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d is not supported\n"
-msgstr "Êݸ¥ë¥´¥ê¥º¥à %d ¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
+msgstr "Êݸ¥ë¥´¥ê¥º¥à%d¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
 #: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
-msgstr "̵¸ú¤Ê¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ç¤¹¡£ºÆÆþÎϤ·¤Æ²¼¤µ¤¤ ...\n"
+msgstr "̵¸ú¤Ê¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ç¤¹¡£ºÆÆþÎϤ·¤Æ¤¯¤À¤µ¤¤ ...\n"
 
 #: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
-msgstr "·Ù¹ð: ¼å¤¤¸°¤¬¸¡½Ð¤µ¤ì¤Þ¤·¤¿¡£¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÊѹ¹¤·¤Æ²¼¤µ¤¤¡£\n"
+msgstr "·Ù¹ð: ¼å¤¤¸°¤ò¸¡½Ð¤·¤Þ¤·¤¿¡£¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
 #: g10/sig-check.c:199
 msgid "assuming bad MDC due to an unknown critical bit\n"
-msgstr "ÉÔÌÀ¤Ê¥¯¥ê¥Æ¥£¥«¥ë¥Ó¥Ã¥È¤¬¤¢¤Ã¤¿¤Î¤Ç¡¢MDC ¤ÏÉÔÀµ¤À¤È¸«¤Ê¤·¤Þ¤¹\n"
+msgstr "̤ÃΤΥ¯¥ê¥Æ¥£¥«¥ë¡¦¥Ó¥Ã¥È¤¬¤¢¤Ã¤¿¤Î¤Ç¡¢ÉÔÀµ¤ÊMDC¤È¤ß¤Ê¤·¤Þ¤¹\n"
 
 #: g10/sig-check.c:297
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
-"¤³¤ì¤Ï PGP ¤Ë¤è¤Ã¤ÆºîÀ®¤µ¤ì¤¿ ElGamal "
-"¸°¤Ç¤¹¡£¤³¤Î¸°¤Ï½ð̾¤ËÍѤ¤¤ë¤Ë¤Ï°ÂÁ´¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!\n"
+"¤³¤ì¤ÏPGP¤ÎÀ¸À®¤·¤¿ElGamal¸°¤Ç¤¹¡£\n"
+"½ð̾¤ËÍѤ¤¤ë¤Ë¤Ï¡¢¤³¤Î¸°¤Ï°ÂÁ´¤Ç¤Ï ¤Ê¤¤ ¤Ç¤¹!\n"
 
 #: g10/sig-check.c:305
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
-msgstr "¸ø³«¸°¤Ï½ð̾¤è¤ê¤â %lu Éøå¤ËºîÀ®¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
+msgstr "¸ø³«¸°¤Ï½ð̾¤è¤ê¤â%luÉøå¤ËºîÀ®¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
 #: g10/sig-check.c:306
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
-msgstr "¸ø³«¸°¤Ï½ð̾¤è¤ê¤â %lu Éøå¤ËºîÀ®¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
+msgstr "¸ø³«¸°¤Ï½ð̾¤è¤ê¤â%luÉøå¤ËºîÀ®¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/sig-check.c:324
-#, c-format
-msgid "NOTE: signature key expired %s\n"
-msgstr "Ãí°Õ: ½ð̾¤Î¸°¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹ %s\n"
+#: g10/sig-check.c:328
+#, fuzzy, c-format
+msgid "NOTE: signature key %08lX expired %s\n"
+msgstr "Ãí°Õ: ½ð̾¤Î¸°¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹%s\n"
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
-msgstr "ÉÔÌÀ¤Ê¥¯¥ê¥Æ¥£¥«¥ë¥Ó¥Ã¥È¤¬¤¢¤Ã¤¿¤Î¤Ç¡¢½ð̾¤ÏÉÔÀµ¤À¤È¸«¤Ê¤·¤Þ¤¹\n"
+msgstr "̤ÃΤΥ¯¥ê¥Æ¥£¥«¥ë¡¦¥Ó¥Ã¥È¤¬¤¢¤Ã¤¿¤Î¤Ç¡¢½ð̾¤ÏÉÔÀµ¤À¤È¤ß¤Ê¤·¤Þ¤¹\n"
+
+#: g10/sign.c:152
+#, fuzzy, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "½ð̾¤ò¸¡¾Ú¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: g10/sign.c:140
+#: g10/sign.c:161
 #, c-format
 msgid "%s signature from: %s\n"
-msgstr "%s ½ð̾¡£½ð̾¼Ô: %s\n"
+msgstr "%s½ð̾¡£½ð̾¼Ô: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:307 g10/sign.c:630
 #, c-format
 msgid "can't create %s: %s\n"
-msgstr "%s ¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n"
+msgstr "%s¤¬¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:405
 msgid "signing:"
 msgstr "½ð̾:"
 
-#: g10/sign.c:431
+#: g10/sign.c:448
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
-msgstr "·Ù¹ð: `%s' ¤Ï¶õ¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹\n"
+msgstr "·Ù¹ð: `%s'¤Ï¶õ¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹\n"
 
 #: g10/textfilter.c:134
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
-msgstr "%d ʸ»ú°Ê¾å¤ÎŤµ¤Î¥Æ¥­¥¹¥È¹Ô¤Ï»ÈÍѤǤ­¤Þ¤»¤ó\n"
+msgstr "%dʸ»ú°Ê¾å¤ÎŤµ¤Î¥Æ¥­¥¹¥È¹Ô¤Ï»ÈÍѤǤ­¤Þ¤»¤ó\n"
 
 #: g10/textfilter.c:231
 #, c-format
 msgid "input line longer than %d characters\n"
-msgstr "ÆþÎϹԤÎŤµ¤¬ %d ʸ»ú¤ò±Û¤¨¤Æ¤¤¤Þ¤¹\n"
+msgstr "ÆþÎϹԤÎŤµ¤¬%dʸ»ú¤òĶ¤¨¤Æ¤¤¤Þ¤¹\n"
 
 #: g10/tdbio.c:116 g10/tdbio.c:1623
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
-msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹ ¥ì¥³¡¼¥É %lu: ¥·¡¼¥¯¤Ë¼ºÇÔ: %s\n"
+msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹ ¥ì¥³¡¼¥É%lu: ¥·¡¼¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
 #: g10/tdbio.c:122 g10/tdbio.c:1630
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
-msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹ ¥ì¥³¡¼¥É %lu: ½ñ¤­¹þ¤ß¤Ë¼ºÇÔ (n=%d): %s\n"
+msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹ ¥ì¥³¡¼¥É%lu: ½ñ¹þ¤ß¤Ë¼ºÇÔ (n=%d): %s\n"
 
 #: g10/tdbio.c:232
 msgid "trustdb transaction too large\n"
-msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹ ¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¤¬Â礭¤¹¤®¤Þ¤¹\n"
+msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¤¬Â礭¤¹¤®¤Þ¤¹\n"
 
 #: g10/tdbio.c:424
 #, c-format
@@ -2892,7 +3015,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: ¼­½ñ¤¬¤¢¤ê¤Þ¤»¤ó!\n"
 
-#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
+#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: ºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n"
@@ -2900,12 +3023,12 @@
 #: g10/tdbio.c:459 g10/tdbio.c:508
 #, c-format
 msgid "%s: can't create lock\n"
-msgstr "%s: ¥í¥Ã¥¯¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó\n"
+msgstr "%s: ¥í¥Ã¥¯¤¬¤Ç¤­¤Þ¤»¤ó\n"
 
 #: g10/tdbio.c:473
 #, c-format
 msgid "%s: failed to create version record: %s"
-msgstr "%s: ¥Ð¡¼¥¸¥ç¥ó¥ì¥³¡¼¥É¤ÎºîÀ®¤Ë¼ºÇÔ: %s"
+msgstr "%s: ¥Ð¡¼¥¸¥ç¥ó¡¦¥ì¥³¡¼¥É¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
 
 #: g10/tdbio.c:477
 #, c-format
@@ -2915,7 +3038,7 @@
 #: g10/tdbio.c:480
 #, c-format
 msgid "%s: trustdb created\n"
-msgstr "%s: ¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤òºîÀ®¤·¤Þ¤·¤¿\n"
+msgstr "%s: ¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤¬¤Ç¤­¤Þ¤·¤¿\n"
 
 #: g10/tdbio.c:517
 #, c-format
@@ -2925,193 +3048,188 @@
 #: g10/tdbio.c:550
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
-msgstr "%s: ¥Ï¥Ã¥·¥åɽ¤ÎºîÀ®¤Ë¼ºÇÔ: %s\n"
+msgstr "%s: ¥Ï¥Ã¥·¥åɽ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
 #: g10/tdbio.c:558
 #, c-format
 msgid "%s: error updating version record: %s\n"
-msgstr "%s: ¥Ð¡¼¥¸¥ç¥ó¥ì¥³¡¼¥É¤Î¹¹¿·¥¨¥é¡¼: %s\n"
+msgstr "%s: ¥Ð¡¼¥¸¥ç¥ó¡¦¥ì¥³¡¼¥É¤Î¹¹¿·¥¨¥é¡¼: %s\n"
 
 #: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
 #: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
 #, c-format
 msgid "%s: error reading version record: %s\n"
-msgstr "%s: ¥Ð¡¼¥¸¥ç¥ó¥ì¥³¡¼¥É¤ÎÆɤ߽Ф·¥¨¥é¡¼: %s\n"
+msgstr "%s: ¥Ð¡¼¥¸¥ç¥ó¡¦¥ì¥³¡¼¥É¤ÎÆɽФ·¥¨¥é¡¼: %s\n"
 
 #: g10/tdbio.c:587 g10/tdbio.c:646
 #, c-format
 msgid "%s: error writing version record: %s\n"
-msgstr "%s: ¥Ð¡¼¥¸¥ç¥ó¥ì¥³¡¼¥É¤Î½ñ¤­¹þ¤ß¥¨¥é¡¼: %s\n"
+msgstr "%s: ¥Ð¡¼¥¸¥ç¥ó¡¦¥ì¥³¡¼¥É¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n"
 
 #: g10/tdbio.c:1235
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
-msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹: ¥·¡¼¥¯¤Ë¼ºÇÔ: %s\n"
+msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹: ¥·¡¼¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
 #: g10/tdbio.c:1243
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
-msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹: Æɤ߽Ф·¤Ë¼ºÇÔ (n=%d): %s\n"
+msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹: ÆɽФ·¤Ë¼ºÇÔ (n=%d): %s\n"
 
 #: g10/tdbio.c:1264
 #, c-format
 msgid "%s: not a trustdb file\n"
-msgstr "%s: ¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
+msgstr "%s: ¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
 #: g10/tdbio.c:1280
 #, c-format
 msgid "%s: version record with recnum %lu\n"
-msgstr "%s: ¥ì¥³¡¼¥ÉÈÖ¹æ %lu È֤ΥС¼¥¸¥ç¥ó¥ì¥³¡¼¥É\n"
+msgstr "%s: ¥ì¥³¡¼¥ÉÈÖ¹æ%luÈ֤ΥС¼¥¸¥ç¥ó¡¦¥ì¥³¡¼¥É\n"
 
 #: g10/tdbio.c:1285
 #, c-format
 msgid "%s: invalid file version %d\n"
-msgstr "%s: ̵¸ú¤Ê¥Õ¥¡¥¤¥ë¥Ð¡¼¥¸¥ç¥ó %d\n"
+msgstr "%s: ̵¸ú¤Ê¥Õ¥¡¥¤¥ë¡¦¥Ð¡¼¥¸¥ç¥ó%d\n"
 
 #: g10/tdbio.c:1589
 #, c-format
 msgid "%s: error reading free record: %s\n"
-msgstr "%s: ¶õ¤­¥ì¥³¡¼¥É¤ÎÆɤ߽Ф·¥¨¥é¡¼: %s\n"
+msgstr "%s: ¶õ¤­¥ì¥³¡¼¥É¤ÎÆɽФ·¥¨¥é¡¼: %s\n"
 
 #: g10/tdbio.c:1597
 #, c-format
 msgid "%s: error writing dir record: %s\n"
-msgstr "%s: ¶õ¤­¥ì¥³¡¼¥É¤Î½ñ¤­¹þ¤ß¥¨¥é¡¼: %s\n"
+msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n"
 
 #: g10/tdbio.c:1607
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
-msgstr "%s: ¥ì¥³¡¼¥É¤Î½é´ü²½¤Ë¼ºÇÔ: %s\n"
+msgstr "%s: ¥ì¥³¡¼¥É¤Î½é´ü²½¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
 #: g10/tdbio.c:1637
 #, c-format
 msgid "%s: failed to append a record: %s\n"
-msgstr "%s: ¥ì¥³¡¼¥É¤Î½é´ü²½¤Ë¼ºÇÔ: %s\n"
+msgstr "%s: ¥ì¥³¡¼¥É¤ÎÄɲä˼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
 #: g10/tdbio.c:1748
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
-"¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤¬²õ¤ì¤Æ¤¤¤Þ¤¹¡£\"gpg --fix-trustdb\" ¤ò¼Â¹Ô¤·¤Æ²¼¤µ¤¤¡£\n"
+"¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤¬²õ¤ì¤Æ¤¤¤Þ¤¹¡£¡Ögpg --fix-trustdb¡×¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
 #: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
-msgstr "¿®Íѥ쥳¡¼¥É %lu, ¥ê¥¯¥¨¥¹¥È¥¿¥¤¥× %d: Æɤ߽Ф·¤Ë¼ºÇÔ: %s\n"
+msgstr "¿®Íѥ쥳¡¼¥É%lu, ¥ê¥¯¥¨¥¹¥È¡¦¥¿¥¤¥×%d: ÆɽФ·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
 #: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
-msgstr "¿®Íѥ쥳¡¼¥É %lu, ¥¿¥¤¥× %d: ½ñ¤­¹þ¤ß¤Ë¼ºÇÔ: %s\n"
+msgstr "¿®Íѥ쥳¡¼¥É%lu, ¥¿¥¤¥×%d: ½ñ¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
 #: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
-msgstr "¿®Íѥ쥳¡¼¥É %lu: ºï½ü¤Ë¼ºÇÔ: %s\n"
+msgstr "¿®Íѥ쥳¡¼¥É%lu: ºï½ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
 #: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
-msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹: Ʊ´ü¤Ë¼ºÇÔ: %s\n"
+msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹: Ʊ´ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
 #: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
-msgstr "LID %lu ¤Î¥Ç¥£¥ì¥¯¥È¥ê¥ì¥³¡¼¥É¤ÎÆɤ߽Ф·¥¨¥é¡¼: %s\n"
+msgstr "LID %lu¤Î¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É¤ÎÆɽФ·¥¨¥é¡¼: %s\n"
 
 #: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
-msgstr "lid %lu: ´üÂÔ¤µ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¥ì¥³¡¼¥É¡¢¥¿¥¤¥× %d\n"
+msgstr "lid %lu: ´üÂÔ¤µ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É¡¢¥¿¥¤¥×%d\n"
 
 #: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
-msgstr "LID %lu ¤Î¼ç¸°¤¬¤¢¤ê¤Þ¤»¤ó\n"
+msgstr "LID %lu¤Î¼ç¸°¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
 #: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
-msgstr "LID %lu ¤Î¼ç¸°¤ÎÆɤ߽Ф·¥¨¥é¡¼: %s\n"
+msgstr "LID %lu¤Î¼ç¸°¤ÎÆɽФ·¥¨¥é¡¼: %s\n"
 
 #: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
-msgstr "get_dir_record: search_record ¤Ë¼ºÇÔ: %s\n"
+msgstr "get_dir_record: search_record ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
 #: g10/trustdb.c:474
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid long keyID\n"
-msgstr "%s ¤ÏÀµ¤·¤¤Ê¸»ú¥³¡¼¥É¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
+msgstr "'%s' ¤ÏÀµ¤·¤¤Âç·¿¸°ID¤Ç¤¢¤ê¤Þ¤»¤ó\n"
 
 #: g10/trustdb.c:501
 #, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
-msgstr "¸° %08lX: ¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ËÅÐÏ¿¤Ç¤­¤Þ¤»¤ó\n"
+msgstr "¸°%08lX: ¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ËÅÐÏ¿¤Ç¤­¤Þ¤»¤ó\n"
 
 #: g10/trustdb.c:507
 #, c-format
 msgid "key %08lX: query record failed\n"
-msgstr "¸° %08lX: ¥¯¥¨¥ê¡¼¥ì¥³¡¼¥É¤Ë¼ºÇÔ\n"
+msgstr "¸°%08lX: ¥ì¥³¡¼¥É¤ÎÌä¹ç¤»¤Ë¼ºÇÔ\n"
 
 #: g10/trustdb.c:516
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
-msgstr "¸° %08lX: ´û¤Ë¿®ÍѤ¹¤ë¸°¤Îɽ¤Ë¤¢¤ê¤Þ¤¹\n"
+msgstr "¸°%08lX: ´û¤Ë¿®ÍѤ¹¤ë¸°¤Îɽ¤Ë¤¢¤ê¤Þ¤¹\n"
 
 #: g10/trustdb.c:519
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
-msgstr "¸° %08lX: ¿®ÍѤ¹¤ë¸°¤È¤·¤Æ¼õÍý¤µ¤ì¤Þ¤·¤¿¡£\n"
+msgstr "¸°%08lX: ¿®ÍѤ¹¤ë¸°¤È¤·¤Æ¼õÍý¤·¤Þ¤·¤¿¡£\n"
 
 #: g10/trustdb.c:546
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
-msgstr "¸° %08lX: rfc2440 ¤Î¸°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó - ¥¹¥­¥Ã¥×¤·¤Þ¤¹\n"
+msgstr "¸° %08lX: ¿®ÍѤ¹¤ë¸°¤Î¸ø³«¸°¤¬¤¢¤ê¤Þ¤»¤ó - ¥¹¥­¥Ã¥×\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"
+msgstr "Ãí°Õ: ÈëÌ©¸°%08lX¤ÏÊݸ¤ì¤Æ¤¤¤Þ ¤»¤ó¡£\n"
 
 #: g10/trustdb.c:584
 #, c-format
 msgid "key %08lX: secret and public key don't match\n"
-msgstr "¸° %08lX: ÈëÌ©¸°¤È¸ø³«¸°¤¬Âбþ¤·¤Æ¤¤¤Þ¤»¤ó\n"
+msgstr "¸°%08lX: ÈëÌ©¸°¤È¸ø³«¸°¤¬Âбþ¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
 #: g10/trustdb.c:597
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
-msgstr "ÈëÌ©¸°¤Î°ìÍ÷¤Ë¼ºÇÔ: %s\n"
+msgstr "ÈëÌ©¸°¤ÎÎóµó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
 #: g10/trustdb.c:987
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
-msgstr "¸° %08lX.%lu: Éû¸°¤ÎÂбþ¤ÏÍ­¸ú¤Ç¤¹\n"
+msgstr "¸°%08lX.%lu: Éû¸°¤ÎÂбþ¤ÏÍ­¸ú¤Ç¤¹\n"
 
 #: g10/trustdb.c:993 g10/trustdb.c:1028
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
-msgstr "¸° %08lX.%lu: Éû¸°¤ÎÂбþ¤¬Ìµ¸ú¤Ç¤¹: %s\n"
+msgstr "¸°%08lX.%lu: Éû¸°¤ÎÂбþ¤¬Ìµ¸ú¤Ç¤¹: %s\n"
 
 #: g10/trustdb.c:1005
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
-msgstr "¸° %08lX.%lu: Í­¸ú¤Ê¸°¤ÎÇÑ»ß\n"
+msgstr "¸°%08lX.%lu: Í­¸ú¤Ê¸°¤ÎÇË´þ\n"
 
 #: g10/trustdb.c:1011
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
-msgstr "¸° %08lX.%lu: ̵¸ú¤Ê¸°¤ÎÇË´þ: %s\n"
+msgstr "¸°%08lX.%lu: ̵¸ú¤Ê¸°¤ÎÇË´þ: %s\n"
 
 #: g10/trustdb.c:1022
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
-msgstr "¸° %08lX.%lu: Í­¸ú¤ÊÉû¸°¤ÎÇË´þ\n"
+msgstr "¸°%08lX.%lu: Í­¸ú¤ÊÉû¸°¤ÎÇË´þ\n"
 
 #: g10/trustdb.c:1133
 msgid "Good self-signature"
@@ -3123,15 +3241,15 @@
 
 #: g10/trustdb.c:1170
 msgid "Valid user ID revocation skipped due to a newer self signature"
-msgstr "¿·¤·¤¯¼«¸Ê½ð̾¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢Í­¸ú¤Ê¥æ¡¼¥¶ ID ¤ÎÇË´þ¤Ï¹Ô¤¤¤Þ¤»¤ó"
+msgstr "¿·¤·¤¯¼«¸Ê½ð̾¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢Í­¸ú¤Ê¥æ¡¼¥¶¡¼ID¤ÎÇË´þ¤Ï¹Ô¤¤¤Þ¤»¤ó"
 
 #: g10/trustdb.c:1176
 msgid "Valid user ID revocation"
-msgstr "Í­¸ú¤Ê¥æ¡¼¥¶ ID ¤ÎÇË´þ"
+msgstr "Í­¸ú¤Ê¥æ¡¼¥¶¡¼ID¤ÎÇË´þ"
 
 #: g10/trustdb.c:1181
 msgid "Invalid user ID revocation"
-msgstr "̵¸ú¤Ê¥æ¡¼¥¶ ID ¤ÎÇË´þ"
+msgstr "̵¸ú¤Ê¥æ¡¼¥¶¡¼ID¤ÎÇË´þ"
 
 #: g10/trustdb.c:1223
 msgid "Valid certificate revocation"
@@ -3152,26 +3270,26 @@
 #: g10/trustdb.c:1270 g10/trustdb.c:1274
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
-msgstr "½ð̾¥ì¥³¡¼¥É %lu[%d] ¤Ï¸í¤Ã¤¿¥ì¥³¡¼¥É¤ò»Ø¤·¤Æ¤¤¤Þ¤¹¡£\n"
+msgstr "½ð̾¥ì¥³¡¼¥É%lu[%d] ¤Ï¸í¤Ã¤¿¥ì¥³¡¼¥É¤ò»Ø¤·¤Æ¤¤¤Þ¤¹¡£\n"
 
 #: g10/trustdb.c:1333
 msgid "duplicated certificate - deleted"
-msgstr "½ÅÊ£¤·¤¿¾ÚÌÀ½ñ - ºï½ü¤·¤Þ¤·¤¿"
+msgstr "½ÅÊ£¤·¤¿¾ÚÌÀ½ñ - ºï½ü"
 
 #: g10/trustdb.c:1650
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
-msgstr "tdbio_search_dir ¤Ë¼ºÇÔ: %s\n"
+msgstr "tdbio_search_dir ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
 #: g10/trustdb.c:1784
 #, c-format
 msgid "lid ?: insert failed: %s\n"
-msgstr "lid ?: ÁÞÆþ¤Ë¼ºÇÔ: %s\n"
+msgstr "lid ?: ÁÞÆþ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
 #: g10/trustdb.c:1789
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
-msgstr "lid %lu: ÁÞÆþ¤Ë¼ºÇÔ: %s\n"
+msgstr "lid %lu: ÁÞÆþ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
 #: g10/trustdb.c:1795
 #, c-format
@@ -3181,47 +3299,47 @@
 #: g10/trustdb.c:1800
 #, c-format
 msgid "error reading dir record: %s\n"
-msgstr "¥Ç¥£¥ì¥¯¥È¥ê¥ì¥³¡¼¥É¤ÎÆɤ߽Ф·¥¨¥é¡¼: %s\n"
+msgstr "¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É¤ÎÆɽФ·¥¨¥é¡¼: %s\n"
 
 #: g10/trustdb.c:1808 g10/trustdb.c:1871
 #, c-format
 msgid "%lu keys processed\n"
-msgstr "%lu ¸°¤ò½èÍý¤·¤Þ¤·¤¿\n"
+msgstr "%lu¸°¤ò½èÍý¤·¤Þ¤·¤¿\n"
 
 #: g10/trustdb.c:1810 g10/trustdb.c:1877
 #, c-format
 msgid "\t%lu keys with errors\n"
-msgstr "\t%lu ¸°¤Ë¤Ï¥¨¥é¡¼¤¬¤¢¤ê¤Þ¤¹\n"
+msgstr "\t%lu¸°¤Ë¤Ï¥¨¥é¡¼¤¬¤¢¤ê¤Þ¤¹\n"
 
 #: g10/trustdb.c:1812
 #, c-format
 msgid "\t%lu keys inserted\n"
-msgstr "\t%lu ¸°¤òÁÞÆþ¤·¤Þ¤·¤¿\n"
+msgstr "\t%lu¸°¤òÁÞÆþ¤·¤Þ¤·¤¿\n"
 
 #: g10/trustdb.c:1815
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
-msgstr "¸°¥Ö¥í¥Ã¥¯¤Î°ìÍ÷¤Ë¼ºÇÔ: %s\n"
+msgstr "¸°¥Ö¥í¥Ã¥¯¤Î°ìÍ÷¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
 #: g10/trustdb.c:1863
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
-msgstr "lid %lu: ¸°¤Ê¤·¤Î¥Ç¥£¥ì¥¯¥È¥ê¥ì¥³¡¼¥É - ¥¹¥­¥Ã¥×\n"
+msgstr "lid %lu: ¸°¤Ê¤·¤Î¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É - ¥¹¥­¥Ã¥×\n"
 
 #: g10/trustdb.c:1873
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
-msgstr "\t%lu ¿·¤¿¤Ê¸ø³«¸°\n"
+msgstr "\t%lu¿·¤·¤¤¸ø³«¸°\n"
 
 #: g10/trustdb.c:1875
 #, c-format
 msgid "\t%lu keys skipped\n"
-msgstr "\t%lu ¸°¤ò¥¹¥­¥Ã¥×¤·¤Þ¤·¤¿\n"
+msgstr "\t%lu¸°¤ò¥¹¥­¥Ã¥×¤·¤Þ¤·¤¿\n"
 
 #: g10/trustdb.c:1879
 #, c-format
 msgid "\t%lu keys updated\n"
-msgstr "\t%lu ¸°¤ò¹¹¿·¤·¤Þ¤·¤¿\n"
+msgstr "\t%lu¸°¤ò¹¹¿·¤·¤Þ¤·¤¿\n"
 
 #: g10/trustdb.c:2224
 msgid "Ooops, no keys\n"
@@ -3229,64 +3347,63 @@
 
 #: g10/trustdb.c:2228
 msgid "Ooops, no user IDs\n"
-msgstr "¤ª¤Ã¤È¡¢¥æ¡¼¥¶ ID ¤¬¤¢¤ê¤Þ¤»¤ó\n"
+msgstr "¤ª¤Ã¤È¡¢¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
 #: g10/trustdb.c:2386
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
-msgstr "check_trust: ¥Ç¥£¥ì¥¯¥È¥ê¥ì¥³¡¼¥É¤Î¸¡º÷¤Ë¼ºÇÔ: %s\n"
+msgstr "check_trust: ¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É¤Î¸¡º÷¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
 #: g10/trustdb.c:2395
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
-msgstr "¸° %08lX: ¿®Íѥ쥳¡¼¥É¤ÎÁÞÆþ¤Ë¼ºÇÔ: %s\n"
+msgstr "¸°%08lX: ¿®Íѥ쥳¡¼¥É¤ÎÁÞÆþ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
 #: g10/trustdb.c:2399
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
-msgstr "¸° %08lX.%lu: ¿®Íѥ쥳¡¼¥É¤ËÁÞÆþ¤·¤Þ¤·¤¿\n"
+msgstr "¸°%08lX.%lu: ¿®Íѥ쥳¡¼¥É¤ËÁÞÆþ¤·¤Þ¤·¤¿\n"
 
 #: g10/trustdb.c:2407
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
-msgstr ""
-"¸° %08lX.%lu: ̤Íè¤ËºîÀ®¤µ¤ì¤Æ¤¤¤Þ¤¹ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n"
+msgstr "¸°%08lX.%lu: ̤Íè¤Ë¤Ç¤­¤Æ¤¤¤Þ¤¹ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n"
 
 #: g10/trustdb.c:2422
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
-msgstr "¸° %08lX.%lu: %s ¤Ç´ü¸ÂÀÚ¤ì¤Ç¤¹\n"
+msgstr "¸°%08lX.%lu: %s¤Ç´ü¸ÂÀÚ¤ì¤Ç¤¹\n"
 
 #: g10/trustdb.c:2430
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
-msgstr "¸° %08lX.%lu: ¿®ÍѤθ¡¾Ú¤Ë¼ºÇÔ: %s\n"
+msgstr "¸°%08lX.%lu: ¿®ÍѤθ¡¾Ú¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
 #: g10/trustdb.c:2581
 #, c-format
 msgid "user '%s' not found: %s\n"
-msgstr "¥æ¡¼¥¶ '%s' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
+msgstr "¥æ¡¼¥¶¡¼'%s'¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
 
 #: g10/trustdb.c:2583
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
-msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤«¤é '%s' ¤Î¸¡º÷¤Ë¾ã³²: %s\n"
+msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤«¤é'%s'¤Î¸¡º÷¤Ë¾ã³²: %s\n"
 
 #: g10/trustdb.c:2586
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
-msgstr "¥æ¡¼¥¶ '%s' ¤Ï¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ËÅÐÏ¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó - ÁÞÆþ¤·¤Þ¤·¤¿\n"
+msgstr "¥æ¡¼¥¶¡¼'%s'¤Ï¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ËÅÐÏ¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó - ÁÞÆþ\n"
 
 #: g10/trustdb.c:2589
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
-msgstr "'%s' ¤Î¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Ø¤ÎÅÐÏ¿¤Ë¼ºÇÔ: %s\n"
+msgstr "'%s'¤Î¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Ø¤ÎÅÐÏ¿¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
 #: g10/trustdb.c:2775 g10/trustdb.c:2805
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "·Ù¹ð: ¤Þ¤À long pref ¥ì¥³¡¼¥É¤Ï¼è¤ê°·¤¨¤Þ¤»¤ó\n"
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -3296,64 +3413,74 @@
 "(.sig¤ä.asc)¤¬¥³¥Þ¥ó¥É¹Ô¤ÎºÇ½é¤Ç¤Ê¤±¤ì¤Ð\n"
 "¤Ê¤é¤Ê¤¤¤³¤È¤òǰƬ¤Ë¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
-msgstr "ÆþÎϤÎ%u¹ÔÌܤ¬Ä¹²á¤®¤ë¤«¡¢LF¤¬¤Ê¤¤¤è¤¦¤Ç¤¹\n"
+msgstr "ÆþÎϤÎ%u¹ÔÌܤ¬Ä¹¤¹¤®¤ë¤«¡¢LF¤¬¤Ê¤¤¤è¤¦¤Ç¤¹\n"
 
 #: g10/ringedit.c:302
 #, c-format
 msgid "%s: can't create keyring: %s\n"
-msgstr "%s: ¸°¥ê¥ó¥°¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n"
+msgstr "%s: ¸°Îؤ¬¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1374
+#: g10/ringedit.c:319 g10/ringedit.c:1376
 #, c-format
 msgid "%s: keyring created\n"
-msgstr "%s: ¸°¥ê¥ó¥°¤òºîÀ®¤·¤Þ¤·¤¿\n"
+msgstr "%s: ¸°Îؤ¬¤Ç¤­¤Þ¤·¤¿\n"
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1557
 msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr "·Ù¹ð: ¿®ÍѾðÊó¤ò»ý¤Ã¤¿ 2 ¤Ä¤Î¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Þ¤¹¡£\n"
+msgstr "·Ù¹ð: ¿®ÍѾðÊó¤ò¤â¤Ã¤¿2¤Ä¤Î¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Þ¤¹¡£\n"
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1558
 #, c-format
 msgid "%s is the unchanged one\n"
-msgstr "%s ¤ÏÊѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤Êý¤Ç¤¹\n"
+msgstr "%s¤ÏÊѹ¹¤Î¤Ê¤¤Êý¤Ç¤¹\n"
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1559
 #, c-format
 msgid "%s is the new one\n"
-msgstr "%s ¤Ï¿·¤·¤¤Êý¤Ç¤¹\n"
+msgstr "%s¤Ï¿·¤·¤¤Êý¤Ç¤¹\n"
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1560
 msgid "Please fix this possible security flaw\n"
-msgstr "¤³¤Î°ÂÁ´¾å¤Î·ç´Ù¤ò½¤Àµ¤·¤Æ²¼¤µ¤¤\n"
+msgstr "¤³¤Î°ÂÁ´¾å¤Î·ç´Ù¤ò½¤Àµ¤·¤Æ¤¯¤À¤µ¤¤\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
-"¸°¤Ë¤Ï°ÂÁ´¤Ç¤Ê¤¤¥Õ¥é¥°¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó - "
-"µ¶ÊªÍð¿ôÀ¸À®ÁõÃ֤ˤÏÄɲäǤ­¤Þ¤»¤ó!\n"
+"¤ä¤Ð¤¯¤Æ¤â¤¤¤¤¥Õ¥é¥°¤¬¸°¤Ë¤ÏÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
+"µ¶ÊªÍð¿ôÀ¸À®»Ò¤È¤Ï¤¤¤Ã¤·¤ç¤Ë»È¤¨¤Þ¤»¤ó!\n"
+
+#: g10/skclist.c:138
+#, fuzzy, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "`%s'¤ò¥¹¥­¥Ã¥×: %s\n"
 
-#: g10/skclist.c:113
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
-msgstr "`%s' ¤ò¥¹¥­¥Ã¥×: %s\n"
+msgstr "`%s'¤ò¥¹¥­¥Ã¥×: %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+#, fuzzy
+msgid "skipped: secret key already present\n"
+msgstr "%s: ¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï´û¤Ë¤¢¤ê¤Þ¤¹\n"
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
 "signatures!\n"
 msgstr ""
-"`%s' ¤ò¥¹¥­¥Ã¥×: ¤³¤ì¤Ï PGP ¤¬À¸À®¤·¤¿ ElGamal "
-"¸°¤Ç¤¹¡£¤³¤Î¸°¤Ï½ð̾¤ËÍѤ¤¤ë¤Ë¤Ï°ÂÁ´¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!\n"
+"`%s'¤ò¥¹¥­¥Ã¥×: ¤³¤ì¤ÏPGP¤ÎÀ¸À®¤·¤¿ElGamal¸°¤Ç¤¹¡£\n"
+"½ð̾¤ËÍѤ¤¤ë¤Ë¤Ï¡¢°ÂÁ´¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!\n"
 
 #. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
-msgstr "¥Õ¥¡¥¤¥ë `%s' ¤Ï´û¤Ë¸ºß¤·¤Þ¤¹¡£"
+msgstr "¥Õ¥¡¥¤¥ë`%s'¤Ï´û¤Ë¸ºß¤·¤Þ¤¹¡£"
 
 #: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
@@ -3362,84 +3489,90 @@
 #: g10/openfile.c:119
 #, c-format
 msgid "%s: unknown suffix\n"
-msgstr "%s: ÉÔÌÀ¤Ê³ÈÄ¥»Ò\n"
+msgstr "%s: ̤ÃΤγÈÄ¥»Ò\n"
 
 #: g10/openfile.c:141
 msgid "Enter new filename"
-msgstr "¿·¤·¤¤¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Æ²¼¤µ¤¤"
+msgstr "¿·¤·¤¤¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
-#: g10/openfile.c:182
+#: g10/openfile.c:184
 msgid "writing to stdout\n"
 msgstr "ɸ½à½ÐÎϤ˽ñ¤­½Ð¤·¤Þ¤¹\n"
 
-#: g10/openfile.c:261
+#: g10/openfile.c:273
 #, c-format
 msgid "assuming signed data in `%s'\n"
-msgstr "½ð̾¤µ¤ì¤¿¥Ç¡¼¥¿¤¬ `%s' ¤Ë¤¢¤ë¤ÈÁÛÄꤷ¤Þ¤¹\n"
+msgstr "½ð̾¤µ¤ì¤¿¥Ç¡¼¥¿¤¬`%s'¤Ë¤¢¤ë¤ÈÁÛÄꤷ¤Þ¤¹\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:323
 #, c-format
 msgid "%s: new options file created\n"
-msgstr "%s: ¿·¤·¤¤¥ª¥×¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Þ¤·¤¿\n"
+msgstr "%s: ¿·¤·¤¤¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë¤¬¤Ç¤­¤Þ¤·¤¿\n"
 
-#: g10/openfile.c:338
+#: g10/openfile.c:350
 #, c-format
 msgid "%s: can't create directory: %s\n"
-msgstr "%s: ¼­½ñ¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n"
+msgstr "%s: ¼­½ñ¤¬¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: g10/openfile.c:341
+#: g10/openfile.c:353
 #, c-format
 msgid "%s: directory created\n"
-msgstr "%s: ¼­½ñ¤òºîÀ®¤·¤Þ¤·¤¿\n"
+msgstr "%s: ¼­½ñ¤¬¤Ç¤­¤Þ¤·¤¿\n"
 
-#: g10/openfile.c:343
+#: g10/openfile.c:355
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr "¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë¤òÆɤßľ¤¹¤è¤¦¡¢GnuPG¤òºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤\n"
 
 #: g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
-msgstr "%s °Å¹æ²½¤µ¤ì¤¿¥Ç¡¼¥¿\n"
+msgstr "%s°Å¹æ²½¤µ¤ì¤¿¥Ç¡¼¥¿\n"
 
 #: g10/encr-data.c:68
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
-msgstr "ÉÔÌÀ¤Ê¥¢¥ë¥´¥ê¥º¥à¤Ë¤è¤ë°Å¹æ %d\n"
+msgstr "̤ÃΤΥ¢¥ë¥´¥ê¥º¥à¤Ë¤è¤ë°Å¹æ %d\n"
 
 #: g10/encr-data.c:90
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
-msgstr "·Ù¹ð: ¥á¥Ã¥»¡¼¥¸¤ÏÂоΰŹæË¡¤Î¼å¤¤¸°¤Ë¤è¤ê°Å¹æ²½¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
+msgstr "·Ù¹ð: ¥á¥Ã¥»¡¼¥¸¤ÏÂоΰŹæË¡¤Î¼å¤¤¸°¤Ç°Å¹æ²½¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
+
+#: g10/encr-data.c:97
+#, fuzzy
+msgid "problem handling encrypted packet\n"
+msgstr ""
+"°Å¹æ¥Ñ¥±¥Ã¥È¤Î¸°ID¥Õ¥£¡¼¥ë¥É\n"
+"¤òÁ÷½Ð"
 
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
-msgstr "¼å¤¤¸°¤¬ºîÀ®¤µ¤ì¤Þ¤·¤¿ - ºÆ¼Â¹Ô¤·¤Þ¤¹\n"
+msgstr "¼å¤¤¸°¤¬¤Ç¤­¤Þ¤·¤¿ - ºÆ¼Â¹Ô\n"
 
 #: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
-msgstr "ÂоΰŹæË¡¤Î¼å¤¤¸°¤ò²óÈò¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£%d ²ó»î¤ß¤Þ¤·¤¿!\n"
-
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "¤³¤Î¸ø³«¸°¤Î°Ù¤ÎÈëÌ©¸°¤¬¤¢¤ê¤Þ¤¹!\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr ""
-"¤Þ¤º¤³¤ì¤òºï½ü¤¹¤ë¤Ë¤Ï \"--delete-secret-key\" ¥ª¥×¥·¥ç¥ó ¤òÍѤ¤¤Æ²¼¤µ¤¤¡£\n"
+msgstr "ÂоΰŹæË¡¤Î¼å¤¤¸°¤ò²óÈò¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£%d²ó»î¤ß¤Þ¤·¤¿!\n"
 
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
-msgstr "\"--yes\" ¤òȼ¤ï¤Ê¤¤¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤Ï¼Â¹Ô¤Ç¤­¤Þ¤»¤ó\n"
+msgstr "¡Ö--yes¡×¤Î¤Ê¤¤¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤Ï¤Ç¤­¤Þ¤»¤ó\n"
 
 #: g10/delkey.c:136
 msgid "Delete this key from the keyring? "
-msgstr "¤³¤Î¸°¤ò¸°¥ê¥ó¥°¤«¤éºï½ü¤·¤Þ¤¹¤«? "
+msgstr "¤³¤Î¸°¤ò¸°Îؤ«¤éºï½ü¤·¤Þ¤¹¤«? "
 
 #: g10/delkey.c:144
 msgid "This is a secret key! - really delete? "
-msgstr "ÈëÌ©¸°¤¬¤¢¤ê¤Þ¤¹! - ËÜÅö¤Ë ºï½ü¤·¤Þ¤¹¤«? "
+msgstr "¤³¤ì¤ÏÈëÌ©¸°¤Ç¤¹! ËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? "
+
+#: g10/delkey.c:181
+msgid "there is a secret key for this public key!\n"
+msgstr "¤³¤Î¸ø³«¸°¤Ë¤¿¤¤¤¹¤ëÈëÌ©¸°¤¬¤¢¤ê¤Þ¤¹!\n"
+
+#: g10/delkey.c:183
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr "¤Þ¤º¡Ö--delete-secret-key¡×¥ª¥×¥·¥ç¥ó¤Ç¤³¤ì¤òºï½ü¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
 #: g10/helptext.c:47
 msgid ""
@@ -3447,22 +3580,22 @@
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
 "to do with the (implicitly created) web-of-certificates."
 msgstr ""
-"¤³¤³¤ÇÀßÄꤷ¤¿Ãͤϡ¢Â礭¤¹¤®¤Þ¤¹¡£¤³¤ÎÃͤϷ褷¤ÆÂè»°¼Ô¤Ë¤ÏÄ󶡤µ¤ì¤Þ¤»¤ó¡£\n"
-"¤½¤ì¤ò¹Ô¤¦¤Ë¤Ï¡¢²æ¡¹¤¬ web-of-trust ¤ò¼ÂÁõ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¤¬¡¢\n"
-"(°ÅÌÛŪ¤ËºîÀ®¤µ¤ì¤¿) web-of-certificates ¤¬Ìµ¤¯¤Æ¤Ï²¿¤â¤Ç¤­¤Þ¤»¤ó¡£"
+"¤³¤ÎÃͤÎÀßÄê¤Ï¡¢¤¢¤Ê¤¿¼¡Âè¤Ç¤¹¡£¤³¤ÎÃͤϡ¢Âè»°¼Ô¤Ë·è¤·\n"
+"¤ÆÄ󶡤µ¤ì¤Þ¤»¤ó¡£¤³¤ì¤Ï¡¢web-of-trust ¤Î¼ÂÁõ¤ËɬÍפǡ¢\n"
+"(°ÅÌÛŪ¤Ë¤Ç¤­¤¿) web-of-certificates ¤È¤Ï̵´Ø·¸¤Ç¤¹¡£"
 
 #: g10/helptext.c:53
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
-msgstr "¤³¤ÎÇË´þ¤µ¤ì¤¿¸°¤ò»È¤¤¤¿¤¯¤Ê¤±¤ì¤Ð¡¢\"no\" ¤ÈÅú¤¨¤Æ²¼¤µ¤¤¡£"
+msgstr "¤³¤ÎÇË´þ¤µ¤ì¤¿¸°¤ò»È¤¤¤¿¤¯¤Ê¤±¤ì¤Ð¡¢¡Öno¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£"
 
 #: g10/helptext.c:57
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr "¤³¤Î¿®ÍѤǤ­¤Ê¤¤¸°¤ò»È¤¤¤¿¤¯¤Ê¤±¤ì¤Ð¡¢\"no\" ¤ÈÅú¤¨¤Æ²¼¤µ¤¤¡£"
+msgstr "¤³¤Î¿®ÍѤǤ­¤Ê¤¤¸°¤ò»È¤¤¤¿¤¯¤Ê¤±¤ì¤Ð¡¢¡Öno¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£"
 
 #: g10/helptext.c:61
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
-msgstr "¥á¥Ã¥»¡¼¥¸¤òÁ÷¤ëÁê¼ê¥¢¥É¥ì¥¹¤Î¥æ¡¼¥¶ ID ¤òÆþÎϤ·¤Æ²¼¤µ¤¤¡£"
+msgstr "¥á¥Ã¥»¡¼¥¸¤òÁ÷¤ëÁê¼ê¥¢¥É¥ì¥¹¤Î¥æ¡¼¥¶¡¼ID¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£"
 
 #: g10/helptext.c:65
 msgid ""
@@ -3484,22 +3617,21 @@
 "this is the reason why the encryption only ElGamal key is not available in\n"
 "this menu."
 msgstr ""
-"»ÈÍѤ¹¤ë¥¢¥ë¥´¥ê¥º¥à¤ÎÁªÂò\n"
+"»ÈÍѤ¹¤ë¥¢¥ë¥´¥ê¥º¥à¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 "\n"
-"DSA (ÊÌ̾ DSS) ¤Ï¡¢½ð̾¤Ë¤Î¤ßÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤ëÅŻҽð̾¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹¡£\n"
-"DSA ½ð̾¤Ï ElGamal Ë¡¤è¤ê¤â¹â®¤Ë¸¡¾Ú¤Ç¤­¤ë¤Î¤Ç¡¢¤³¤ì¤Ï¿ä¾©¤¹¤ë¥¢¥ë¥´¥ê¥º¥à\n"
-"¤Ç¤¹¡£\n"
-"\n"
-"ElGamal ¤Ï¡¢½ð̾¤È°Å¹æ²½¤ËÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤ë¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹¡£\n"
-"OpenPGP "
-"¤Ç¤Ï¡¢¤³¤Î¥¢¥ë¥´¥ê¥º¥à¤Î¡Ö°Å¹æ²½¤Î¤ß¡×¤È¡Ö½ð̾+°Å¹æ²½¡×¤Î£²¤Ä¤ÎÍÑË¡¤ò\n"
-"¶èÊ̤·¤Æ¤¤¤Þ¤¹¤¬¡¢¼ÂºÝ¤Ë¤ÏƱ¤¸¤Ç¤¹¡£¤·¤«¤·¡¢½ð̾ÍѤΰÂÁ´¤Ê¸°¤òÀ¸À®¤¹¤ë¤Ë¤Ï\n"
-"¤¤¤¯¤Ä¤«¤ÎÊÑ¿ô¤òÆÃÊ̤ÊÊýË¡¤ÇÁªÂò¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£¤³¤Î¥×¥í¥°¥é¥à¤Ç¤Ï¡¢\n"
-"¤½¤ì¤Ï²Äǽ¤Ç¤¹¤¬¡¢OpenPGP "
-"¤Î¾¤Î¼ÂÁõ¤Ç¤Ï¡Ö½ð̾+°Å¹æ²½¡×¤ÎÍÑË¡¤ò²ò¼á¤·¤Þ¤»¤ó¡£\n"
+"DSA (ÊÌ̾DSS) ¤Ï¡¢½ð̾¤Ë¤Î¤ßÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤ëÅŻҽð̾¥¢¥ë¥´¥ê\n"
+"¥º¥à¤Ç¤¹¡£DSA½ð̾¤ÏElGamalË¡¤è¤ê¤â¹â®¤Ë¸¡¾Ú¤Ç¤­¤ë¤Î¤Ç¡¢¤³¤ì¤Ï\n"
+"¿ä¾©¤¹¤ë¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹¡£\n"
+"\n"
+"ElGamal¤Ï¡¢½ð̾¤È°Å¹æ²½¤ËÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤ë¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹¡£\n"
+"OpenPGP¤Ç¤Ï¡¢¤³¤Î¥¢¥ë¥´¥ê¥º¥à¤Î¡Ö°Å¹æ²½¤Î¤ß¡×¤È¡Ö½ð̾+°Å¹æ²½¡×\n"
+"¤Î2¤Ä¤ÎÍÑË¡¤ò¶èÊ̤·¤Æ¤¤¤Þ¤¹¤¬¡¢¼ÂºÝ¤Ë¤ÏƱ¤¸¤Ç¤¹¡£¤·¤«¤·¡¢½ð̾ÍÑ\n"
+"¤Î°ÂÁ´¤Ê¸°¤òºî¤ë¤Ë¤Ï°ìÉô¤ÎÊÑ¿ô¤òÆÃÊ̤ÊÊýË¡¤ÇÁªÂò¤·¤Ê¤±¤ì¤Ð¤Ê¤ê\n"
+"¤Þ¤»¤ó¡£¤³¤Î¥×¥í¥°¥é¥à¤Ç¤Ï¤½¤ì¤¬²Äǽ¤Ç¤¹¤¬¡¢Â¾¤ÎOpenPGP¤Î¼ÂÁõ¤Ç\n"
+"¤Ï¡¢¡Ö½ð̾+°Å¹æ²½¡×¤ÎÍÑË¡¤ò²ò¼á¤·¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n"
 "\n"
-"ºÇ½é¤Î¸°(¼ç¸°)¤Ï½ð̾¤Ë»ÈÍѤǤ­¤ë¸°¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n"
-"¤³¤Î¤³¤È¤¬¡Ö°Å¹æ²½¤Î¤ß¡×¤Î ElGamal ¸°¤¬¡¢¤³¤Î¥á¥Ë¥å¡¼¤Ë̵¤¤¤³¤È¤ÎÍýͳ¤Ç¤¹¡£"
+"ºÇ½é¤Î¸°(¼ç¸°)¤Ï¡¢½ð̾¤Ë»ÈÍѤǤ­¤ë¸°¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£¤³¤ì¤¬\n"
+"¤³¤Î¥á¥Ë¥å¡¼¤Ë¡Ö°Å¹æ²½¤Î¤ß¡×¤ÎElGamal¸°¤Î¤Ê¤¤Íýͳ¤Ç¤¹¡£"
 
 #: g10/helptext.c:85
 msgid ""
@@ -3507,18 +3639,18 @@
 "because they are not supported by all programs and signatures created\n"
 "with them are quite large and very slow to verify."
 msgstr ""
-"¤³¤ì¤é¤Î¸°¤Ï RFC2440 ¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¿ä¾©¤·¤Þ¤»¤ó¡£\n"
-"²¿¸Î¤Ê¤é¡¢¤³¤ì¤é¤ÏÁ´¤Æ¤Î¥×¥í¥°¥é¥à¤Ë¤è¤Ã¤Æ¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¯¡¢\n"
-"À¸À®¤µ¤ì¤ë½ð̾¤ÏÈó¾ï¤ËŤ¯¤Æ¡¢¸¡¾Ú¤Ë¤â»þ´Ö¤¬¤«¤«¤ë¤¿¤á¤Ç¤¹¡£"
+"¤³¤ì¤é¤Î¸°¤ÏRFC2440¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¿ä¾©¤·¤Þ¤»¤ó¡£\n"
+"¤Ê¤¼¤Ê¤é¡¢¤³¤ì¤é¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¥×¥í¥°¥é¥à¤¬¤¢¤ê¡¢\n"
+"ºîÀ®¤µ¤ì¤ë½ð̾¤ÏÈó¾ï¤ËŤ¯¤Æ¡¢¸¡¾Ú¤Ë¤â»þ´Ö¤¬¤«¤«¤ë¤¿¤á¤Ç¤¹¡£"
 
 #: g10/helptext.c:92
 msgid "Enter the size of the key"
-msgstr "¸°¤ÎŤµ¤òÆþÎϤ·¤Æ²¼¤µ¤¤"
+msgstr "¸°¤ÎŤµ¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
 #: g10/helptext.c:96 g10/helptext.c:101 g10/helptext.c:113 g10/helptext.c:145
 #: g10/helptext.c:150 g10/helptext.c:155 g10/helptext.c:160
 msgid "Answer \"yes\" or \"no\""
-msgstr "\"yes\" ¤Þ¤¿¤Ï \"no\" ¤ÇÅú¤¨¤Æ²¼¤µ¤¤"
+msgstr "¡Öyes¡×¤«¡Öno¡×¤ÇÅú¤¨¤Æ¤¯¤À¤µ¤¤"
 
 #: g10/helptext.c:106
 msgid ""
@@ -3527,22 +3659,22 @@
 "get a good error response - instead the system tries to interpret\n"
 "the given value as an interval."
 msgstr ""
-"¥×¥í¥ó¥×¥È¤Ë¼¨¤µ¤ì¤ë½ñ¼°¤ÇÃͤòÆþÎϤ·¤Æ²¼¤µ¤¤¡£\n"
-"ISO ¤ÎÆüÉդνñ¼° (YYYY-MM-DD) ¤Ç¤âÆþÎϤǤ­¤Þ¤¹¤¬¡¢Àµ¤·¤¤¥¨¥é¡¼¤Ï\n"
-"ɽ¼¨¤µ¤ì¤Ê¤¤¤Ç¤·¤ç¤¦ - ¤½¤ÎÂå¤ï¤ê¤Ë¡¢¥·¥¹¥Æ¥à¤ÏÆþÎÏÃͤò´Ö³Ö¤ËÊÑ´¹¤¹¤ë\n"
+"¥×¥í¥ó¥×¥È¤Ë¼¨¤¹½ñ¼°¤ÇÃͤòÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£\n"
+"ISO¤ÎÆüÉդνñ¼° (YYYY-MM-DD) ¤Ç¤âÆþÎϤǤ­¤Þ¤¹¤¬¡¢Àµ¤·¤¤¥¨¥é¡¼¤Ï\n"
+"ɽ¼¨¤µ¤ì¤Ê¤¤¤Ç¤·¤ç¤¦¡£¤½¤ÎÂå¤ê¡¢¥·¥¹¥Æ¥à¤ÏÆþÎÏÃͤò´ü´Ö¤ØÊÑ´¹¤¹¤ë\n"
 "¤è¤¦¤Ë»î¤ß¤Þ¤¹¡£"
 
 #: g10/helptext.c:118
 msgid "Enter the name of the key holder"
-msgstr "¸°¥Û¥ë¥À¤Î̾Á°¤òÆþÎϤ·¤Æ²¼¤µ¤¤"
+msgstr "¸°¥Û¥ë¥À¤Î̾Á°¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
 #: g10/helptext.c:123
 msgid "please enter an optional but highly suggested email address"
-msgstr "¥ª¥×¥·¥ç¥ó¤Ç¤¹¤¬¡¢ÅŻҥ᡼¥ë¥¢¥É¥ì¥¹¤òÆþÎϤ¹¤ë¤³¤È¤ò¶¯¤¯¿ä¾©¤·¤Þ¤¹"
+msgstr "¥ª¥×¥·¥ç¥ó¤Ç¤¹¤¬¡¢ÅŻҥ᡼¥ë¤Î¥¢¥É¥ì¥¹¤òÆþÎϤ¹¤ë¤³¤È¤ò¶¯¤¯¿ä¾©¤·¤Þ¤¹"
 
 #: g10/helptext.c:127
 msgid "Please enter an optional comment"
-msgstr "¥ª¥×¥·¥ç¥ó¤Î¥³¥á¥ó¥È¤òÆþÎϤ·¤Æ²¼¤µ¤¤"
+msgstr "¥ª¥×¥·¥ç¥ó¤Î¥³¥á¥ó¥È¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
 #: g10/helptext.c:132
 msgid ""
@@ -3552,31 +3684,31 @@
 "O  to continue with key generation.\n"
 "Q  to to quit the key generation."
 msgstr ""
-"N  ̾Á°¤ÎÊѹ¹\n"
-"C  ¥³¥á¥ó¥È¤ÎÊѹ¹\n"
-"E  ÅŻҥ᡼¥ë¥¢¥É¥ì¥¹¤ÎÊѹ¹\n"
-"O  ¸°¤ÎÀ¸À®¤Î³¹Ô\n"
-"Q  ¸°¤ÎÀ¸À®¤ÎÃæ»ß"
+"N  ̾Á°¤ÎÊѹ¹¡£\n"
+"C  ¥³¥á¥ó¥È¤ÎÊѹ¹¡£\n"
+"E  ÅŻҥ᡼¥ë¤Î¥¢¥É¥ì¥¹¤ÎÊѹ¹¡£\n"
+"O  ¸°¤ÎÀ¸À®¤Î³¹Ô¡£\n"
+"Q  ¸°¤ÎÀ¸À®¤ÎÃæ»ß¡£"
 
 #: g10/helptext.c:141
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr "Éû¸°¤òÀ¸À®¤¹¤ë¾ì¹ç¡¢\"yes\" (¤Þ¤¿¤Ï¡¢Ã±¤Ë \"y\") ¤ÈÅú¤¨¤Æ²¼¤µ¤¤¡£"
+msgstr "Éû¸°¤òÀ¸À®¤¹¤ë¾ì¹ç¡¢¡Öyes¡×(¤Þ¤¿¤Ï¡¢Ã±¤Ë¡Öy¡×) ¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£"
 
 #: g10/helptext.c:164
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
-msgstr "Á´¤Æ¤Î ¥æ¡¼¥¶ ID ¤Ë½ð̾¤·¤¿¤±¤ì¤Ð¡¢\"yes\" ¤ÈÅú¤¨¤Æ²¼¤µ¤¤"
+msgstr "Á´¤Æ¤Î ¥æ¡¼¥¶¡¼ID¤Ë½ð̾¤·¤¿¤±¤ì¤Ð¡¢¡Öyes¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤"
 
 #: g10/helptext.c:168
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
 msgstr ""
-"¤³¤ì¤é¤Î¥æ¡¼¥¶ ID ¤ò ËÜÅö¤Ë ºï½ü¤·¤¿¤±¤ì¤Ð¡¢\"yes\" "
-"¤ÈÅú¤¨¤Æ²¼¤µ¤¤Á´¤Æ¤Î¾ÚÌÀ½ñ¤âƱ»þ¤Ëºï½ü¤µ¤ì¤Þ¤¹!"
+"¤³¤ì¤é¤Î¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤¿¤±¤ì¤Ð¡¢¡Öyes¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£\n"
+"¾ÚÌÀ½ñ¤âÁ´ÉôƱ»þ¤Ëºï½ü¤·¤Þ¤¹!"
 
 #: g10/helptext.c:173
 msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "¤³¤ÎÉû¸°¤òºï½ü¤¹¤ë¾ì¹ç¡¢\"yes\" ¤ÈÅú¤¨¤Æ²¼¤µ¤¤"
+msgstr "¤³¤ÎÉû¸°¤òºï½ü¤¹¤ë¾ì¹ç¡¢¡Öyes¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤"
 
 #: g10/helptext.c:178
 msgid ""
@@ -3584,9 +3716,9 @@
 "to delete this signature because it may be important to establish a\n"
 "trust connection to the key or another key certified by this key."
 msgstr ""
-"¤³¤ì¤Ï¸°¤ËÂФ¹¤ëÍ­¸ú¤Ê½ð̾¤Ç¤¹¡£Ä̾ï¤Ï¤³¤Î½ð̾¤Ïºï½ü¤·¤¿¤¯¤Ê¤¤¤Ç¤·¤ç¤¦¡£\n"
-"²¿¸Î¤Ê¤é¡¢¤³¤Î½ð̾¤Ï¡¢¸°¤Ø¤Î¿®ÍѤÎÎؤκîÀ®¤ä¡¢¤³¤Î¸°¤Ë¤è¤ë¾ÚÌÀ¤Ë¤È¤Ã¤Æ\n"
-"½ÅÍפÀ¤«¤é¤Ç¤¹¡£"
+"¤³¤ì¤Ï¸°¤Ë¤¿¤¤¤¹¤ëÍ­¸ú¤Ê½ð̾¤Ç¤¹¡£ÉáÄ̤³¤Î½ð̾¤òºï½ü¤¹¤ë¤Ù¤­¤Ç\n"
+"¤Ï¤Ê¤¤¤Ç¤·¤ç¤¦¡£¤Ê¤¼¤Ê¤é¡¢¤³¤Î½ð̾¤Ï¡¢¸°¤Ø¤Î¿®ÍѤÎÎؤκîÀ®¤ä¡¢\n"
+"¤³¤Î¸°¤Ë¤è¤ë¾ÚÌÀ¤Ë¤È¤Ã¤Æ½ÅÍפÀ¤«¤é¤Ç¤¹¡£"
 
 #: g10/helptext.c:183
 msgid ""
@@ -3596,17 +3728,17 @@
 "a trust connection through another already certified key."
 msgstr ""
 "¤³¤Î½ð̾¤È°ìÃפ¹¤ë¸°¤òÊÝÍ­¤·¤Æ¤¤¤Ê¤¤¤Î¤Ç¡¢¤³¤Î½ð̾¤Ï¸¡¾Ú¤Ç¤­¤Þ¤»¤ó¡£\n"
-"¤¢¤Ê¤¿¤Ï¤½¤Î¸°¤¬»ÈÍѤµ¤ì¤ë¤Þ¤Ç¤Ï¡¢¤³¤Î½ð̾¤Îºï½ü¤òÊÝα¤¹¤ë¤Ù¤­¤Ç¤¹¡£\n"
-"²¿¸Î¤Ê¤é¡¢¤³¤Î½ð̾¤Î¸°¤Ï¡¢Â¾¤Î¾ÚÌÀ¤µ¤ì¤¿¸°¤Ë¤è¤Ã¤Æ¿®ÍѤÎÎؤò·ÁÀ®¤¹¤ë¤«¤â\n"
-"ÃΤì¤Ê¤¤¤«¤é¤Ç¤¹¡£"
+"¤½¤Î¸°¤¬»ÈÍѤµ¤ì¤ë¤Þ¤Ç¤Ï¡¢¤¢¤Ê¤¿¤Ï¤³¤Î½ð̾¤Îºï½ü¤òÊÝα¤¹¤ë¤Ù¤­¤Ç¤¹¡£\n"
+"¤Ê¤¼¤Ê¤é¡¢¤³¤Î½ð̾¤Î¸°¤Ï¡¢Â¾¤Î¾ÚÌÀ¤µ¤ì¤¿¸°¤Ç¿®ÍѤÎÎؤò·ÁÀ®¤¹¤ë¤«¤â\n"
+"¤·¤ì¤Ê¤¤¤«¤é¤Ç¤¹¡£"
 
 #: g10/helptext.c:189
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr ""
-"¤³¤Î½ð̾¤ÏÍ­¸ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤³¤Î¤³¤È¤Ï¡¢¤¢¤Ê¤¿¤Î¸°¥ê¥ó¥°¤«¤éºï½ü¤¹¤Ù¤­¤À\n"
-"¤È¤¤¤¦¤³¤È¤ò°ÕÌ£¤·¤Æ¤¤¤Þ¤¹¡£"
+"¤³¤Î½ð̾¤ÏÍ­¸ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤³¤Î¤³¤È¤Ï¡¢¤¢¤Ê¤¿¤Î¸°Îؤ«¤éºï½ü¤¹¤Ù¤­¤À\n"
+"¤È¤¤¤¦°ÕÌ£¤Ç¤¹¡£"
 
 #: g10/helptext.c:193
 msgid ""
@@ -3616,38 +3748,38 @@
 "only if this self-signature is for some reason not valid and\n"
 "a second one is available."
 msgstr ""
-"¤³¤ì¤Ï¡¢¸°¤Î¥æ¡¼¥¶ ID ¤ËÂбþ¤·¤¿½ð̾¤Ç¤¹¡£Ä̾¤³¤Î½ð̾¤òºï½ü¤¹¤ë¤Î¤Ï\n"
-"Îɤ¤¹Í¤¨¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¼ÂºÝ¤Ë¤Ï¡¢GnuPG ¤Ï¤â¤Ï¤ä¤³¤Î¸°¤ò»È¤¨¤Ê¤¤¤Î¤«¤â\n"
-"ÃΤì¤Þ¤»¤ó¡£¤è¤Ã¤Æ¡¢¤³¤Î¼«¸Ê½ð̾¤¬²¿¤é¤«¤ÎÍýͳ¤Ë¤è¤ê̵¸ú¤Ç¤¢¤Ã¤Æ¡¢\n"
-"ÂåÂؤȤʤ븰¤¬¤¢¤ë¾ì¹ç¤Ë¤Î¤ß¡¢ºï½ü¤ò¼Â¹Ô¤·¤Æ²¼¤µ¤¤¡£"
+"¤³¤ì¤Ï¡¢¸°¤Î¥æ¡¼¥¶¡¼ID¤ËÂбþ¤·¤¿½ð̾¤Ç¤¹¡£Ä̾¤³¤Î½ð̾¤òºï½ü¤¹¤ë¤Î¤Ï\n"
+"¤¤¤¤¹Í¤¨¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¼ÂºÝ¤Ë¤Ï¡¢GnuPG¤Ï¤â¤Ï¤ä¤³¤Î¸°¤ò»È¤¨¤Ê¤¤¤Î¤«¤â\n"
+"¤·¤ì¤Þ¤»¤ó¡£¤è¤Ã¤Æ¡¢¤³¤Î¼«¸Ê½ð̾¤¬²¿¤é¤«¤ÎÍýͳ¤Ë¤è¤ê̵¸ú¤Ç¤¢¤Ã¤Æ¡¢\n"
+"ÂåÂؤȤʤ븰¤¬¤¢¤ë¾ì¹ç¤Ë¤Î¤ß¡¢ºï½ü¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
 #: g10/helptext.c:202
 msgid ""
 "Please enter the passhrase; this is a secret sentence \n"
 "  Blurb, blurb,.... "
 msgstr ""
-"¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎϤ·¤Æ²¼¤µ¤¤¡£¤³¤ì¤ÏÈëÌ©¤Îʸ¾Ï¤Î¤³¤È¤Ç¤¹¡£\n"
-"  ¥Û¥²¥Û¥².... "
+"¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£¤³¤ì¤ÏÈëÌ©¤Îʸ¾Ï¤Î¤³¤È¤Ç¤¹¡£\n"
+"  ¤«¤¯¤«¤¯¤·¤«¤¸¤«¡¢¤¢¤ì¤³¤ì¡Ä "
 
 #: g10/helptext.c:209
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr "ÆþÎϤ·¤¿¥Õ¥ì¡¼¥º¤ò³Îǧ¤¹¤ë¤¿¤á¤Ë¡¢¥Ñ¥¹¥Õ¥ì¡¼¥º¤òºÆÆþÎϤ·¤Æ²¼¤µ¤¤¡£"
+msgstr "ÆþÎϤ·¤¿¥Ñ¥¹¥Õ¥ì¡¼¥º¤Î³Îǧ¤Î¤¿¤á¡¢ºÆÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£"
 
 #: g10/helptext.c:213
 msgid "Give the name of the file to which the signature applies"
-msgstr "½ð̾¤ò¹Ô¤¦¥Õ¥¡¥¤¥ë¤Î̾Á°¤òµ­½Ò¤·¤Æ²¼¤µ¤¤"
+msgstr "½ð̾¤ò¹Ô¤¦¥Õ¥¡¥¤¥ë¤Î̾Á°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤"
 
 #: g10/helptext.c:218
 msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "¾å½ñ¤­¤·¤Æ¤âÎɤ±¤ì¤Ð¡¢\"yes\" ¤ÈÅú¤¨¤Æ²¼¤µ¤¤"
+msgstr "¾å½ñ¤­¤·¤Æ¤è¤±¤ì¤Ð¡¢¡Öyes¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤"
 
 #: g10/helptext.c:223
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
 msgstr ""
-"¿·¤·¤¤¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Æ²¼¤µ¤¤¡£Ã±¤Ë¥ê¥¿¡¼¥ó¥­¡¼¤ò²¡¤¹¤È¡¢\n"
-"¥Ç¥Õ¥©¥ë¥È¤Î¥Õ¥¡¥¤¥ë̾ (³ç¸Ì¤Ç°Ï¤Þ¤ì¤¿¤â¤Î) ¤¬»ÈÍѤµ¤ì¤Þ¤¹"
+"¿·¤·¤¤¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£Ã±¤Ë¥ê¥¿¡¼¥ó¡¦¥­¡¼¤ò²¡¤¹¤È¡¢\n"
+"(³ç¸Ì¤Ç°Ï¤ó¤À) ´ûÄê¤Î¥Õ¥¡¥¤¥ë̾¤ò»ÈÍѤ·¤Þ¤¹¡£"
 
 #: g10/helptext.c:229
 msgid ""
@@ -3664,6 +3796,19 @@
 "      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"
 msgstr ""
+"¾ÚÌÀ½ñ¤ËÍýͳ¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£Á°¸å´Ø·¸¤Ë¤â¤è¤ê¤Þ¤¹¤¬¡¢\n"
+"°Ê²¼¤«¤éÁª¤Ö¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£\n"
+"  ¡Ö¸°¤¬¥Ñ¥¯¤é¤ì¤Þ¤·¤¿¡×\n"
+"      ǧ¾Ú¤µ¤ì¤Æ¤¤¤Ê¤¤¿Í¤¬ÈëÌ©¸°¤Ø¤Î¥¢¥¯¥»¥¹¤òÆÀ¤¿¡¢¤È¿®¤º¤ë\n"
+"      ¤Ë­¤ëÍýͳ¤Î¤¢¤ë¤È¤­¤Ë¡¢¤³¤ì¤ò»È¤¤¤Þ¤¹¡£\n"
+"  ¡Ö¸°¤¬¤È¤ê¤«¤ï¤Ã¤Æ¤¤¤Þ¤¹¡×\n"
+"      ¤³¤Î¸°¤ò¼«Ê¬¤Ç¿·¤·¤¤¸°¤È¤È¤ê¤«¤¨¤¿¤È¤­¤Ë»È¤¤¤Þ¤¹¡£\n"
+"  ¡Ö¸°¤Ï¤â¤¦»È¤ï¤ì¤Æ¤¤¤Þ¤»¤ó¡×\n"
+"      ¤³¤Î¸°¤ò»È¤¦¤Î¤ò¤ä¤á¤¿¤È¤­¤Ë»È¤¤¤Þ¤¹¡£\n"
+"  ¡Ö¥æ¡¼¥¶¡¼ID¤¬¤â¤¦Í­¸ú¤Ç¤¢¤ê¤Þ¤»¤ó¡×\n"
+"      ¤â¤¦¤½¤Î¥æ¡¼¥¶¡¼ID¤Ï»È¤¦¤Ù¤­¤Ç¤Ê¤¤¡¢¤È¤¤¤¦¤È¤­¤Ë»È¤¤\n"
+"      ¤Þ¤¹¡£¤³¤ì¤ÏÉáÄÌ¡¢ÅŻҥ᡼¥ë¤Î¥¢¥É¥ì¥¹¤¬Ìµ¸ú¤Ë¤Ê¤Ã¤¿¤È\n"
+"      ¤­¤Ë»È¤¤¤Þ¤¹¡£\n"
 
 #: g10/helptext.c:245
 msgid ""
@@ -3671,6 +3816,9 @@
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
+"¤â¤·¤½¤¦¤·¤¿¤±¤ì¤Ð¡¢¤Ê¤¼ÇË´þ¾ÚÌÀ½ñ¤òȯ¹Ô¤¹¤ë¤Î¤«¤òÀâÌÀ¤¹¤ë¥Æ\n"
+"¥­¥¹¥È¤òÆþÎϤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥Æ¥­¥¹¥È¤Ï´Ê·é¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
+"¶õ¹Ô¤Ç½ª¤ï¤ê¤Ë¤Ê¤ê¤Þ¤¹¡£\n"
 
 #: g10/helptext.c:260
 msgid "No help available"
@@ -3679,33 +3827,22 @@
 #: g10/helptext.c:268
 #, 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 "¥Ç¥Ð¥Ã¥°¥Õ¥é¥°¤ò¥»¥Ã¥È¤¹¤ë"
+msgstr "`%s'¤Î¥Ø¥ë¥×¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#~ msgid "enable full debugging"
-#~ msgstr "Á´¤Æ¤Î¥Ç¥Ð¥Ã¥°¤òÍ­¸ú¤Ë¤¹¤ë"
+#~ msgid "invalid"
+#~ msgstr "̵¸ú"
 
-#~ msgid "do not write comment packets"
-#~ msgstr "¥³¥á¥ó¥È¥Ñ¥±¥Ã¥È¤ò½ñ¤­½Ð¤µ¤Ê¤¤"
+#~ msgid "revoked"
+#~ msgstr "ÇË´þºÑ¤ß"
 
-#~ msgid "(default is 1)"
-#~ msgstr "(¥Ç¥Õ¥©¥ë¥È¤Ï 1)"
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤ÏRSA¸°¤Ï»È¤¨¤Þ¤»¤ó\n"
 
-#~ msgid "(default is 3)"
-#~ msgstr "(¥Ç¥Õ¥©¥ë¥È¤Ï 3)"
+#~ msgid "No key for user ID\n"
+#~ msgstr "¥æ¡¼¥¶¡¼ID¤Î¸°¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#~ msgid "   (%d) ElGamal in a v3 packet\n"
-#~ msgstr "   (%d) ElGamal in a v3 packet\n"
+#~ msgid "No user ID for key\n"
+#~ msgstr "¸°¤Î¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#~ msgid "Key generation can only be used in interactive mode\n"
-#~ msgstr "¸°¤ÎºîÀ®¤ÏÂÐÏå⡼¥É¤Ç¤·¤«¼Â¹Ô¤Ç¤­¤Þ¤»¤ó\n"
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "Éü¹æ¤ËɬÍפÊÈëÌ©¸°¤¬ÆÀ¤é¤ì¤Þ¤»¤ó\n"
diff -urN gnupg-1.0.4/po/nl.po gnupg-1.0.5/po/nl.po
--- gnupg-1.0.4/po/nl.po	Tue Oct 17 15:40:39 2000
+++ gnupg-1.0.5/po/nl.po	Sun Apr 29 16:39:28 2001
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-10-16 19:22+0200\n"
+"POT-Creation-Date: 2001-04-29 16:39+0200\n"
 "PO-Revision-Date: 2000-02-20 21:30+01:00\n"
 "Last-Translator: Ivo Timmermans <itimmermans@bigfoot.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -17,35 +17,35 @@
 msgid "Warning: using insecure memory!\n"
 msgstr "Let op: er wordt onveilig geheugen gebruikt!\n"
 
-#: util/secmem.c:295
+#: util/secmem.c:299
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "bewerking is niet mogelijk zonder initialisatie van veilig geheugen\n"
 
-#: util/secmem.c:296
+#: util/secmem.c:300
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(misschien heb je hiervoor het verkeerde programma gebruikt)\n"
 
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:287 util/miscutil.c:316
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:288 util/miscutil.c:319
 msgid "yY"
 msgstr "yYjJ"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:289 util/miscutil.c:317
 msgid "no"
 msgstr "nee"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:290 util/miscutil.c:320
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:318
 msgid "quit"
 msgstr "einde"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:321
 msgid "qQ"
 msgstr "qQeE"
 
@@ -245,6 +245,17 @@
 msgid "not processed"
 msgstr "niet behandeld"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "foutieve publieke sleutel"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "foutieve geheime sleutel"
+
 #: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -255,63 +266,63 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "u heeft een fout in het programma gevonden ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:324
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:329
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:325
+#: cipher/random.c:334
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:331
+#: cipher/random.c:340
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:339
+#: cipher/random.c:348
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:386
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:397
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan %s niet aanmaken: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:413
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:416
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:427
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:650
+#: cipher/random.c:661
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "LET OP: de willekeurige getallengenerator is niet veilig!!\n"
 
-#: cipher/random.c:651
+#: cipher/random.c:662
 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 +348,7 @@
 "om het besturingssysteem de kans te geven om meer entropie te\n"
 "verzamelen! (Nog %d bytes nodig)\n"
 
-#: g10/g10.c:206
+#: g10/g10.c:216
 msgid ""
 "@Commands:\n"
 " "
@@ -345,139 +356,139 @@
 "@Opdrachten:\n"
 " "
 
-#: g10/g10.c:208
+#: g10/g10.c:218
 msgid "|[file]|make a signature"
 msgstr "|[bestand]|maak een ondertekening"
 
-#: g10/g10.c:209
+#: g10/g10.c:219
 msgid "|[file]|make a clear text signature"
 msgstr "|[bestand]|maak een niet versleutelde ondertekening"
 
-#: g10/g10.c:210
+#: g10/g10.c:220
 msgid "make a detached signature"
 msgstr "maak een losstaande ondertekening"
 
-#: g10/g10.c:211
+#: g10/g10.c:221
 msgid "encrypt data"
 msgstr "versleutel gegevens"
 
-#: g10/g10.c:212
+#: g10/g10.c:222
 msgid "encryption only with symmetric cipher"
 msgstr "versleutel slechts met een symmetrische versleutelmethode"
 
-#: g10/g10.c:213
+#: g10/g10.c:223
 msgid "store only"
 msgstr "alleen bewaren"
 
-#: g10/g10.c:214
+#: g10/g10.c:224
 msgid "decrypt data (default)"
 msgstr "gegevens decoderen (standaard)"
 
-#: g10/g10.c:215
+#: g10/g10.c:225
 msgid "verify a signature"
 msgstr "ondertekening controleren"
 
-#: g10/g10.c:217
+#: g10/g10.c:227
 msgid "list keys"
 msgstr "lijst van sleutels genereren"
 
-#: g10/g10.c:219
+#: g10/g10.c:229
 msgid "list keys and signatures"
 msgstr "sleutels en ondertekeningen opnoemen"
 
-#: g10/g10.c:220
+#: g10/g10.c:230
 msgid "check key signatures"
 msgstr "sleutelverificaties controleren"
 
-#: g10/g10.c:221
+#: g10/g10.c:231
 msgid "list keys and fingerprints"
 msgstr "sleutels en vingerafdrukken opnoemen"
 
-#: g10/g10.c:222
+#: g10/g10.c:232
 msgid "list secret keys"
 msgstr "geheime sleutels opnoemen"
 
-#: g10/g10.c:223
+#: g10/g10.c:233
 msgid "generate a new key pair"
 msgstr "nieuw sleutelpaar genereren"
 
-#: g10/g10.c:224
+#: g10/g10.c:234
 msgid "remove key from the public keyring"
 msgstr "sleutel weghalen uit de publieke sleutelbos"
 
-#: g10/g10.c:226
+#: g10/g10.c:236
 msgid "remove key from the secret keyring"
 msgstr "sleutel weghalen uit de geheime sleutelbos"
 
-#: g10/g10.c:227
+#: g10/g10.c:237
 msgid "sign a key"
 msgstr "onderteken een sleutel"
 
-#: g10/g10.c:228
+#: g10/g10.c:238
 msgid "sign a key locally"
 msgstr "onderteken een sleutel lokaal"
 
-#: g10/g10.c:229
+#: g10/g10.c:239
 msgid "sign or edit a key"
 msgstr "onderteken of bewerk een sleutel"
 
-#: g10/g10.c:230
+#: g10/g10.c:240
 msgid "generate a revocation certificate"
 msgstr "genereer een terugtrekkings-certificaat"
 
-#: g10/g10.c:231
+#: g10/g10.c:241
 msgid "export keys"
 msgstr "exporteer sleutels"
 
-#: g10/g10.c:232
+#: g10/g10.c:242
 msgid "export keys to a key server"
 msgstr "exporteer sleutels naar een sleutelserver"
 
-#: g10/g10.c:233
+#: g10/g10.c:243
 msgid "import keys from a key server"
 msgstr "importeer sleutels van een sleutelserver"
 
-#: g10/g10.c:237
+#: g10/g10.c:247
 msgid "import/merge keys"
 msgstr "sleutels importeren/samenvoegen"
 
-#: g10/g10.c:239
+#: g10/g10.c:249
 msgid "list only the sequence of packets"
 msgstr "noem alleen de volgorde van pakketten"
 
-#: g10/g10.c:241
+#: g10/g10.c:251
 msgid "export the ownertrust values"
 msgstr "exporteer het vertrouwen in de eigenaars"
 
-#: g10/g10.c:243
+#: g10/g10.c:253
 msgid "import ownertrust values"
 msgstr "importeer het vertrouwen in de eigenaars"
 
-#: g10/g10.c:245
+#: g10/g10.c:255
 msgid "update the trust database"
 msgstr "werk de vertrouwensdatabase bij"
 
-#: g10/g10.c:247
+#: g10/g10.c:257
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMEN]|controleer de vertrouwensdatabase"
 
-#: g10/g10.c:248
+#: g10/g10.c:258
 msgid "fix a corrupted trust database"
 msgstr "repareer een beschadigde vertrouwensdatabase"
 
-#: g10/g10.c:249
+#: g10/g10.c:259
 msgid "De-Armor a file or stdin"
 msgstr "Verwijder de beveiliging op bestand of standaard invoer"
 
-#: g10/g10.c:251
+#: g10/g10.c:261
 msgid "En-Armor a file or stdin"
 msgstr "Voeg beveiliging toe aan bestad of standaard invoer"
 
-#: g10/g10.c:253
+#: g10/g10.c:263
 msgid "|algo [files]|print message digests"
 msgstr "|algo [bestanden]|geef controlegetal van berichten weer"
 
-#: g10/g10.c:257
+#: g10/g10.c:267
 msgid ""
 "@\n"
 "Options:\n"
@@ -487,159 +498,163 @@
 "Opties:\n"
 " "
 
-#: g10/g10.c:259
+#: g10/g10.c:269
 msgid "create ascii armored output"
 msgstr "genereer beveiliging in ASCII"
 
-#: g10/g10.c:261
+#: g10/g10.c:271
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAAM|versleutel voor NAAM"
 
-#: g10/g10.c:264
+#: g10/g10.c:274
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAAM|gebruik NAAM als standaard ontvanger"
 
-#: g10/g10.c:266
+#: g10/g10.c:276
 msgid "use the default key as default recipient"
 msgstr "gebruik de standaard sleutel als standaard ontvanger"
 
-#: g10/g10.c:270
+#: g10/g10.c:280
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "gebruik deze gebruikersidentificatie om te ondertekenen of te decoderen"
 
-#: g10/g10.c:271
+#: g10/g10.c:281
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|stel compressieniveau in op N (uitzetten met 0)"
 
-#: g10/g10.c:273
+#: g10/g10.c:283
 msgid "use canonical text mode"
 msgstr "gebruik de verkorte tekstmodus"
 
-#: g10/g10.c:274
+#: g10/g10.c:284
 msgid "use as output file"
 msgstr "gebruik als uitvoerbestand"
 
-#: g10/g10.c:275
+#: g10/g10.c:285
 msgid "verbose"
 msgstr "geef meer informatie"
 
-#: g10/g10.c:276
+#: g10/g10.c:286
 msgid "be somewhat more quiet"
 msgstr "wees iets stiller"
 
-#: g10/g10.c:277
+#: g10/g10.c:287
 msgid "don't use the terminal at all"
 msgstr "gebruik de terminal helemaal niet"
 
-#: g10/g10.c:278
+#: g10/g10.c:288
 msgid "force v3 signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:279
+#: g10/g10.c:289
 msgid "always use a MDC for encryption"
 msgstr "gebruik altijd een MDC voor versleuteling"
 
-#: g10/g10.c:280
+#: g10/g10.c:290
 msgid "do not make any changes"
 msgstr "maak geen enkele verandering"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:282
+#: g10/g10.c:292
+msgid "use the gpg-agent"
+msgstr ""
+
+#: g10/g10.c:293
 msgid "batch mode: never ask"
 msgstr "doorlopende modus: vraag nooit"
 
-#: g10/g10.c:283
+#: g10/g10.c:294
 msgid "assume yes on most questions"
 msgstr "veronderstel ja als antwoord op de meeste vragen"
 
-#: g10/g10.c:284
+#: g10/g10.c:295
 msgid "assume no on most questions"
 msgstr "veronderstel nee als antwoord op de meeste vragen"
 
-#: g10/g10.c:285
+#: g10/g10.c:296
 msgid "add this keyring to the list of keyrings"
 msgstr "voeg deze sleutelbos toe aan de lijst van sleutelbossen"
 
-#: g10/g10.c:286
+#: g10/g10.c:297
 msgid "add this secret keyring to the list"
 msgstr "voeg deze geheime sleutelbos toe aan de lijst"
 
-#: g10/g10.c:287
+#: g10/g10.c:298
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAAM|gebruik NAAM als standaard geheime sleutel"
 
-#: g10/g10.c:288
+#: g10/g10.c:299
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVER|gebruik deze sleutelserver om sleutels op te zoeken"
 
-#: g10/g10.c:289
+#: g10/g10.c:300
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAAM|zet tekenverzameling van terminal op NAAM"
 
-#: g10/g10.c:290
+#: g10/g10.c:301
 msgid "read options from file"
 msgstr "lees opties uit bestand"
 
-#: g10/g10.c:294
+#: g10/g10.c:305
 msgid "|FD|write status info to this FD"
 msgstr "|BB|schrijf status naar deze bestandsbeschrijver"
 
-#: g10/g10.c:299
+#: g10/g10.c:310
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:300
+#: g10/g10.c:311
 msgid "|FILE|load extension module FILE"
 msgstr "|BESTAND|laad extensiemodule BESTAND"
 
-#: g10/g10.c:301
+#: g10/g10.c:312
 msgid "emulate the mode described in RFC1991"
 msgstr "doe als RFC1991 voorschrijft"
 
-#: g10/g10.c:302
+#: g10/g10.c:313
 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:303
+#: g10/g10.c:314
 msgid "|N|use passphrase mode N"
 msgstr "|N|gebruik sleuteltekst modus N"
 
-#: g10/g10.c:305
+#: g10/g10.c:316
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM voor sleutelteksten"
 
-#: g10/g10.c:307
+#: g10/g10.c:318
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAAM|gebruik versleutelalgoritme NAAM voor sleutelteksten"
 
-#: g10/g10.c:308
+#: g10/g10.c:319
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAAM|gebruik versleutelalgoritme NAAM"
 
-#: g10/g10.c:309
+#: g10/g10.c:320
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM"
 
-#: g10/g10.c:310
+#: g10/g10.c:321
 msgid "|N|use compress algorithm N"
 msgstr "|N|gebruik compressiealgoritme N"
 
-#: g10/g10.c:311
+#: g10/g10.c:322
 msgid "throw keyid field of encrypted packets"
 msgstr "plaats geen sleutelidentificatieveld in versleutelde pakketten"
 
-#: g10/g10.c:312
+#: g10/g10.c:323
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAAM=WAARDE|gebruik deze notitiegegevens"
 
-#: g10/g10.c:315
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:318
+#: g10/g10.c:329
 msgid ""
 "@\n"
 "Examples:\n"
@@ -659,17 +674,17 @@
 " --list-keys [namen]         toon sleutels\n"
 " --fingerprints [namen]      toon vingerafdrukken\n"
 
-#: g10/g10.c:418
+#: g10/g10.c:438
 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:422
+#: g10/g10.c:442
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Gebruik: gpg [opties] [bestanden] (-h voor hulp)"
 
-#: g10/g10.c:425
+#: g10/g10.c:445
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -679,7 +694,7 @@
 "onderteken, controleer, versleutel of decodeer de ingevoerde gegevens\n"
 "standaardactie hangt af van de gegevens\n"
 
-#: g10/g10.c:432
+#: g10/g10.c:452
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -687,188 +702,193 @@
 "\n"
 "Ondersteunde algoritmes:\n"
 
-#: g10/g10.c:511
+#: g10/g10.c:531
 msgid "usage: gpg [options] "
 msgstr "gebruik: gpg [opties] "
 
-#: g10/g10.c:564
+#: g10/g10.c:584
 msgid "conflicting commands\n"
 msgstr "tegenstrijdige commando's\n"
 
-#: g10/g10.c:704
+#: g10/g10.c:734
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "LET OP: geen bestand `%s' met standaardopties\n"
 
-#: g10/g10.c:708
+#: g10/g10.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "optiebestand `%s': %s\n"
 
-#: g10/g10.c:715
+#: g10/g10.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "opties inlezen van `%s'\n"
 
-#: g10/g10.c:905
+#: g10/g10.c:950
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s is een onbekende tekenverzameling\n"
 
-#: g10/g10.c:970
+#: g10/g10.c:1024
 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
+#: g10/g10.c:1028 g10/g10.c:1037
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "LET OP: %s is niet voor gewoon gebruik!\n"
 
-#: g10/g10.c:976
+#: g10/g10.c:1030
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s is niet toegestaan met deze %s!\n"
 
-#: g10/g10.c:979
+#: g10/g10.c:1033
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s heeft geen betekenis met %s!\n"
 
-#: g10/g10.c:998 g10/g10.c:1010
+#: g10/g10.c:1053 g10/g10.c:1065
 msgid "selected cipher algorithm is invalid\n"
 msgstr "geselecteerd versleutelalgoritme is ongeldig\n"
 
-#: g10/g10.c:1004 g10/g10.c:1016
+#: g10/g10.c:1059 g10/g10.c:1071
 msgid "selected digest algorithm is invalid\n"
 msgstr "geselecteerd controle-algoritme is ongeldig\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1075
 msgid "the given policy URL is invalid\n"
 msgstr "de gegeven beleids-URL is ongeldig\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1078
 #, 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:1025
+#: g10/g10.c:1080
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed(?) moet groter zijn dan 0\n"
 
-#: g10/g10.c:1027
+#: g10/g10.c:1082
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed(?) moet groter zijn dan 1\n"
 
-#: g10/g10.c:1029
+#: g10/g10.c:1084
 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:1032
+#: g10/g10.c:1087
 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:1036
+#: g10/g10.c:1091
 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:1121
+#: g10/g10.c:1176
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "fout bij het initialiseren van de vertrouwensdatabase: %s\n"
 
-#: g10/g10.c:1127
+#: g10/g10.c:1182
 msgid "--store [filename]"
 msgstr "--store [bestandsnaam]"
 
-#: g10/g10.c:1134
+#: g10/g10.c:1189
 msgid "--symmetric [filename]"
 msgstr "--symmetric [bestandsnaam]"
 
-#: g10/g10.c:1142
+#: g10/g10.c:1197
 msgid "--encrypt [filename]"
 msgstr "--encrypt [bestandsnaam]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1210
 msgid "--sign [filename]"
 msgstr "--sign [bestandsnaam]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1223
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [bestandsnaam]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1237
 msgid "--clearsign [filename]"
 msgstr "--clearsign [bestandsnaam]"
 
-#: g10/g10.c:1199
+#: g10/g10.c:1254
 msgid "--decrypt [filename]"
 msgstr "--decrypt [bestandsnaam]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1262
 msgid "--sign-key user-id"
 msgstr "--sign-key gebruikersidentificatie"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1270
 msgid "--lsign-key user-id"
 msgstr "--lsign-key gebruikers-identificatie"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1278
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key gebruikersidentificatie [opdrachten]"
 
-#: g10/g10.c:1239
+#: g10/g10.c:1294
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key gebruikersidentificatie"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1297
 msgid "--delete-key user-id"
 msgstr "--delete-key gebruikersidentificatie"
 
-#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
+#: g10/g10.c:1305
+#, fuzzy
+msgid "--delete-secret-and-public-key user-id"
+msgstr "--delete-secret-key gebruikersidentificatie"
+
+#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan %s niet openen: %s\n"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1357
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [gebruikersidentificatie] [sleutelbos]"
 
-#: g10/g10.c:1360
+#: g10/g10.c:1423
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "opheffen van beveiliging mislukt: %s\n"
 
-#: g10/g10.c:1368
+#: g10/g10.c:1431
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "beveiligen mislukt: %s\n"
 
-#: g10/g10.c:1439
+#: g10/g10.c:1502
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ongeldig frommelalgoritme `%s'\n"
 
-#: g10/g10.c:1520
+#: g10/g10.c:1589
 msgid "[filename]"
 msgstr "[bestandsnaam]"
 
-#: g10/g10.c:1524
+#: g10/g10.c:1593
 msgid "Go ahead and type your message ...\n"
 msgstr "Gaat uw gang, type het bericht ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan `%s' niet openen\n"
 
-#: g10/g10.c:1737
+#: g10/g10.c:1805
 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:1743
+#: g10/g10.c:1811
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -876,89 +896,89 @@
 "een notitienaam mag alleen letters, cijfers, punten of underscores bevatten "
 "en eindig met een =\n"
 
-#: g10/g10.c:1749
+#: g10/g10.c:1817
 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:1757
+#: g10/g10.c:1825
 msgid "a notation value must not use any control characters\n"
 msgstr "een notitienaam mag geen controletekens bevatten\n"
 
-#: g10/armor.c:302
+#: g10/armor.c:306
 #, c-format
 msgid "armor: %s\n"
 msgstr "beveiliging: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:335
 msgid "invalid armor header: "
 msgstr "ongeldige beveiliginsinformatie: "
 
-#: g10/armor.c:338
+#: g10/armor.c:342
 msgid "armor header: "
 msgstr "beveiligingsinformatie"
 
-#: g10/armor.c:349
+#: g10/armor.c:353
 msgid "invalid clearsig header\n"
 msgstr "ongeldige informatie over leesbare ondertekening\n"
 
-#: g10/armor.c:401
+#: g10/armor.c:405
 msgid "nested clear text signatures\n"
 msgstr "geneste leesbare ondertekeningen\n"
 
-#: g10/armor.c:525
+#: g10/armor.c:529
 msgid "invalid dash escaped line: "
 msgstr "ongeldige regel met streepjes: "
 
-#: g10/armor.c:537
+#: g10/armor.c:541
 msgid "unexpected armor:"
 msgstr "onverwachte beveiliging:"
 
-#: g10/armor.c:654
+#: g10/armor.c:667 g10/armor.c:1235
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ongeldig wortel64 teken %02x overgeslagen\n"
 
-#: g10/armor.c:697
+#: g10/armor.c:710
 msgid "premature eof (no CRC)\n"
 msgstr "voortijdig einde (geen controlesom)\n"
 
-#: g10/armor.c:731
+#: g10/armor.c:744
 msgid "premature eof (in CRC)\n"
 msgstr "voortijdig einde (in controlesom)\n"
 
-#: g10/armor.c:735
+#: g10/armor.c:748
 msgid "malformed CRC\n"
 msgstr "verkeerde controlesom\n"
 
-#: g10/armor.c:739
+#: g10/armor.c:752 g10/armor.c:1272
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "fout in controlesom; %06lx - %06lx\n"
 
 # fixme
-#: g10/armor.c:756
+#: g10/armor.c:772
 msgid "premature eof (in Trailer)\n"
 msgstr "voortijdig einde (in trailer)\n"
 
 # fixme
-#: g10/armor.c:760
+#: g10/armor.c:776
 msgid "error in trailer line\n"
 msgstr "fout in de trailer regel\n"
 
-#: g10/armor.c:906
+#: g10/armor.c:922
 msgid "For info see http://www.gnupg.org"
 msgstr ""
 
-#: g10/armor.c:1027
+#: g10/armor.c:1050
 msgid "no valid OpenPGP data found.\n"
 msgstr "geen geldige OpenPGP gegevens gevonden.\n"
 
-#: g10/armor.c:1032
+#: g10/armor.c:1055
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ongeldige beveiliging: regel langer dan %d tekens\n"
 
-#: g10/armor.c:1036
+#: g10/armor.c:1059
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -967,7 +987,7 @@
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "            Vingerafdruk:"
 
@@ -1202,17 +1222,17 @@
 "        Het is niet zeker dat deze ondertekening toebehoort aan de "
 "eigenaar.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: overgeslagen: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: overgeslagen: openbare sleutel is al aanwezig\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1220,45 +1240,45 @@
 "Je gaf geen gebruikersidentificatie op. (je kunt \"-r\" gebruiken)\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "Geef de gebruikersidentificatie: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "Gebruiker bestaat niet.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "overgeslagen: openbare sleutel is al ingesteld als de standaard ontvanger\n"
 
 # fixme
-#: g10/pkclist.c:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
 msgstr "Openbare sleutel is niet toegankelijk.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "overgeslagen: openbare sleutel is al ingesteld met --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "onbekende standaard ontvanger `%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: fout tijdens controleren van de sleutel: %s\n"
 
 # fixme
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: overgeslagen: openbare sleutel is niet toegankelijk\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "geen geldige adressen\n"
 
@@ -1266,62 +1286,66 @@
 msgid "writing self signature\n"
 msgstr "zelfondertekening wegschrijven\n"
 
-#: g10/keygen.c:214
+#: g10/keygen.c:217
 msgid "writing key binding signature\n"
 msgstr "schrijven van sleutelbindingsondertekening\n"
 
-#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
+#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Gevraagde sleutellengte is %u bits\n"
 
-#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
+#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "afgerond naar %u bits\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:549
 msgid "Please select what kind of key you want:\n"
 msgstr "Selecteer aub wat voor sleutel u wilt:\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:551
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA en ElGamal (standaard)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:552
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (alleen ondertekenen)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:554
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (alleen versleutelen)\n"
 
-#: g10/keygen.c:546
+#: g10/keygen.c:555
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (ondertekenen en versleutelen)\n"
 
-#: g10/keygen.c:548
+#: g10/keygen.c:557
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (ondertekenen en versleutelen)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:561
 msgid "Your selection? "
 msgstr "Uw keuze? "
 
-#: g10/keygen.c:563 g10/keygen.c:571
+#: g10/keygen.c:572
 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:585
+#: g10/keygen.c:580
+msgid "The use of this algorithm is deprecated - create anyway? "
+msgstr ""
+
+#: g10/keygen.c:594
 msgid "Invalid selection.\n"
 msgstr "Ongeldige keuze.\n"
 
-#: g10/keygen.c:597
+#: g10/keygen.c:606
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1334,19 +1358,19 @@
 "                standaard sleutellengte is 1024 bits\n"
 "     hoogste aan te raden sleutellengte is 2048 bits\n"
 
-#: g10/keygen.c:604
+#: g10/keygen.c:613
 msgid "What keysize do you want? (1024) "
 msgstr "Hoe lang wil je de sleutel maken? (1024) "
 
-#: g10/keygen.c:609
+#: g10/keygen.c:618
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA staat alleen sleutellengtes toe van 512 tot 1024\n"
 
-#: g10/keygen.c:611
+#: g10/keygen.c:620
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
 
-#: g10/keygen.c:613
+#: g10/keygen.c:622
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
@@ -1359,12 +1383,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:624
+#: g10/keygen.c:633
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "sleutel te lang; %d is de maximumlengte.\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:638
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1372,11 +1396,11 @@
 "Sleutels langer dan 2048 worden afgeraden omdat berekeningen dan ERG\n"
 "lang duren!\n"
 
-#: g10/keygen.c:632
+#: g10/keygen.c:641
 msgid "Are you sure that you want this keysize? "
 msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
 
-#: g10/keygen.c:633
+#: g10/keygen.c:642
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1384,21 +1408,21 @@
 "Okee, maar houd er rekening mee dat straling van monitor en toetsenbord ook "
 "erg vatbaar zijn voor aanvallen!\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:650
 msgid "Do you really need such a large keysize? "
 msgstr "Heb je echt een sleutel nodig die zo lang is? "
 
-#: g10/keygen.c:647
+#: g10/keygen.c:656
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Gevraagde sleutellengte is %u bits\n"
 
-#: g10/keygen.c:650 g10/keygen.c:654
+#: g10/keygen.c:659 g10/keygen.c:663
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "afgerond naar %u bits\n"
 
-#: g10/keygen.c:702
+#: g10/keygen.c:711
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1414,26 +1438,26 @@
 "    <n>m = sleutel verloopt over n maanden\n"
 "    <n>y = sleutel verloopt over n jaar\n"
 
-#: g10/keygen.c:717
+#: g10/keygen.c:726
 msgid "Key is valid for? (0) "
 msgstr "Sleutel is geldig gedurende? (0) "
 
-#: g10/keygen.c:722
+#: g10/keygen.c:731
 msgid "invalid value\n"
 msgstr "ongeldige waarde\n"
 
-#: g10/keygen.c:727
+#: g10/keygen.c:736
 msgid "Key does not expire at all\n"
 msgstr "Sleutel verloopt nooit\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:733
+#: g10/keygen.c:742
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Sleutel verloopt op %s\n"
 
 # fixme
-#: g10/keygen.c:736
+#: g10/keygen.c:745
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1441,11 +1465,11 @@
 "Uw systeem kan geen data weergeven van na 2038.\n"
 "Desondanks wordt het goed behandeld tot 2106.\n"
 
-#: g10/keygen.c:741
+#: g10/keygen.c:750
 msgid "Is this correct (y/n)? "
 msgstr "Klopt dit (j/n)? "
 
-#: g10/keygen.c:784
+#: g10/keygen.c:793
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1461,44 +1485,44 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:796
+#: g10/keygen.c:805
 msgid "Real name: "
 msgstr "Echte naam: "
 
-#: g10/keygen.c:804
+#: g10/keygen.c:813
 msgid "Invalid character in name\n"
 msgstr "Ongeldig teken in naam\n"
 
-#: g10/keygen.c:806
+#: g10/keygen.c:815
 msgid "Name may not start with a digit\n"
 msgstr "Naam mag niet beginnen met een cijfer\n"
 
-#: g10/keygen.c:808
+#: g10/keygen.c:817
 msgid "Name must be at least 5 characters long\n"
 msgstr "Naam moet ten minste 5 tekens lang zijn\n"
 
-#: g10/keygen.c:816
+#: g10/keygen.c:825
 msgid "Email address: "
 msgstr "Email Adres: "
 
-#: g10/keygen.c:827
+#: g10/keygen.c:836
 msgid "Not a valid email address\n"
 msgstr "Ongeldig email adres\n"
 
-#: g10/keygen.c:835
+#: g10/keygen.c:844
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:841
+#: g10/keygen.c:850
 msgid "Invalid character in comment\n"
 msgstr "Ongeldig teken in kommentaar\n"
 
-#: g10/keygen.c:864
+#: g10/keygen.c:873
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Je gebruik tekenverzameling `%s'.\n"
 
-#: g10/keygen.c:870
+#: g10/keygen.c:879
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1509,28 +1533,28 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:883
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:879
+#: g10/keygen.c:888
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoEe"
 
-#: g10/keygen.c:889
+#: g10/keygen.c:898
 #, 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:890
+#: g10/keygen.c:899
 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:909
+#: g10/keygen.c:918
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:947
+#: g10/keygen.c:956
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1538,11 +1562,11 @@
 "Je hebt een sleuteltekst nodig om je geheime sleutel te bewaken.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:964
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "sleuteltekst is niet goed herhaald; probeer het opnieuw.\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:970
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1554,7 +1578,7 @@
 "nog aanpassen, gebruik dit programma met de optie \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:982
+#: g10/keygen.c:991
 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 +1591,29 @@
 "dit geeft de generator een grotere kans om genoeg entropie te\n"
 "verzamelen.\n"
 
-#: g10/keygen.c:1431
+#: g10/keygen.c:1440
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA sleutelpaar zal 1024 bits lang zijn.\n"
 
-#: g10/keygen.c:1474
+#: g10/keygen.c:1483
 msgid "Key generation canceled.\n"
 msgstr "Sleutelgeneratie afgebroken.\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1581
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "Openbaar certificaat wordt geschreven naar `%s'\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1582
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "Geheim certificaat wordt weggeschreven naar `%s'\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1679
 msgid "public and secret key created and signed.\n"
 msgstr "openbare en geheime sleutels zijn gemaakt en getekend.\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1684
 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 +1622,12 @@
 "U wilt misschien het commando \"--edit-key\" gebruiken om een tweede\n"
 "sleutel te maken hiervoor.\n"
 
-#: g10/keygen.c:1690 g10/keygen.c:1791
+#: g10/keygen.c:1701 g10/keygen.c:1807
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Sleutelgeneratie is mislukt: %s\n"
 
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1748 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 +1635,7 @@
 "Sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
 "klokprobleem)\n"
 
-#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1750 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 +1643,11 @@
 "sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
 "klokprobleem)\n"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1783
 msgid "Really create? "
 msgstr "Echt maken? "
 
-#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1634,17 +1658,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr "fout tijdens aanmake sleuteltekst: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: LET OP: leeg bestand\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lezen uit `%s'\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s versleuteld voor: %s\n"
@@ -1669,284 +1693,285 @@
 msgid "key %08lX: not protected - skipped\n"
 msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr "LET OP: er is niets geëxporteerd\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:214
 msgid "too many entries in pk cache - disabled\n"
 msgstr "te veel ingangen in de pk cache - uitgezet\n"
 
-#: g10/getkey.c:350
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+#, fuzzy
+msgid "[User id not found]"
+msgstr "%s: gebruiker niet gevonden\n"
+
+#: g10/getkey.c:453
 msgid "too many entries in unk cache - disabled\n"
 msgstr "te veel ingangen in de unk cache - uitgezet\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr "RSA sleutel kan niet gebruikt worden in deze versie\n"
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
-msgstr "Geen sleutel voor gebruikersidentificatie\n"
-
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
-msgstr "Geen gebruikersidentificatie voor sleutel\n"
-
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2207
 #, 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:2050
-#, fuzzy
-msgid "[User id not found]"
-msgstr "%s: gebruiker niet gevonden\n"
+#: g10/getkey.c:2249 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/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok van type %d wordt overgeslagen\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 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:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fout bij lezen `%s': %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totaal aantal behandeld: %lu\n"
 
-#: g10/import.c:206
+#: g10/import.c:208
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "nieuwe subsleutels: %lu\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          zonder identificatie: %lu\n"
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr "geïmporteerd: %lu"
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "onveranderd: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "nieuwe gebruikers: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "nieuwe subsleutels: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "nieuwe ondertekeningen: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "nieuwe sleutelterugtrekkingen: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "geheime sleutels gelezen: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "geheime sleutels geïmporteerd: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "onveranderde geheime sleutels: %lu\n"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "sleutel %08lX: geen gebruikersidentificatie\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "sleutel %08lX: geen geldige gebruikersidentificaties\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 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:418 g10/import.c:657
+#: g10/import.c:435 g10/import.c:684
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "sleutel %08lX: openbare sleutel niet gevonden: %s\n"
 
-#: g10/import.c:423
+#: g10/import.c:440
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "geen standaard openbare sleutelbos\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "schrijven naar `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "kan sleutelbos `%s' niet vergrendelen: %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "sleutel %08lX: openbare sleutel geïmporteerd\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "sleutel %08lX: komt niet overeen met onze kopie\n"
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:489 g10/import.c:692
 #, 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:478 g10/import.c:671
+#: g10/import.c:495 g10/import.c:698
 #, 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:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "sleutel %08lX: 1 nieuwe gebruiker\n"
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "sleutel %08lX: %d nieuwe gebruikers\n"
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "sleutel %08lX: 1 nieuwe ondertekening\n"
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "sleutel %08lX: %d nieuwe ondertekeningen\n"
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "sleutel %08lX: 1 nieuwe subsleutel\n"
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "sleutel %08lX: %d nieuwe subsleutels\n"
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "sleutel %08lX: niet veranderd\n"
 
-#: g10/import.c:613
+#: g10/import.c:610
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:640
 #, 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:617
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "sleutel %08lX: reeds aanwezig in de geheime sleutelbos\n"
 
-#: g10/import.c:622
+#: g10/import.c:649
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "sleutel %08lX: geheime sleutel niet gevonden: %s\n"
 
-#: g10/import.c:651
+#: g10/import.c:678
 #, 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:682
+#: g10/import.c:709
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "sleutel %08lX: ongeldig terugtrekkingscertificaat: %s - afgewezen\n"
 
-#: g10/import.c:714
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "sleutel %08lX: terugtrekkingscertificaat geïmporteerd\n"
 
-#: g10/import.c:756
+#: g10/import.c:783
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "sleutel %08lX: geen gebruikersidentificatie voor ondertekening\n"
 
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:790 g10/import.c:814
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "sleutel %08lX: openbaar sleutel algoritme niet ondersteund\n"
 
-#: g10/import.c:764
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "sleutel %08lX: ongeldige eigen ondertekening\n"
 
-#: g10/import.c:779
+#: g10/import.c:806
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "sleutel %08lX: geen subsleutel voor sleutelbinding\n"
 
-#: g10/import.c:788
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "sleutel %08lX: ongeldige subsleutelbinding\n"
 
-#: g10/import.c:815
+#: g10/import.c:842
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr ""
 "sleutel %08lX: niet zelfondertekende gebruikersidentificatie geaccepteerd '"
 
-#: g10/import.c:844
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "sleutel %08lX: gebruikersidentificatie overgeslagen '"
 
-#: g10/import.c:867
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "sleutel %08lX: subsleutel overgeslagen\n"
@@ -1955,86 +1980,86 @@
 #. * 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:892
+#: g10/import.c:919
 #, 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:901
+#: g10/import.c:928
 #, 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:909
+#: g10/import.c:936
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "sleutel %08lX: ongeldig terugtrekkingscertificaat: %s - overgeslagen\n"
 
-#: g10/import.c:1009
+#: g10/import.c:1036
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 "sleutel %08lX: dubbele gebruikersidentificatie gevonden - samengevoegd\n"
 
-#: g10/import.c:1060
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "sleutel %08lX: terugtrekkingscertificaat toegevoegd\n"
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "sleutel %08lX: onze versie heeft geen zelfondertekening\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: gebruiker niet gevonden\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr "[terugtrekking]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr "[zelfondertekening]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
 msgstr "1 ongeldige ondertekening\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ongeldige ondertekeningen\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 ondertekening niet gecontroleerd wegens een ontbrekende sleutel\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d ondertekeningen niet gecontroleerd wegens ontbrekende sleutels\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
 msgstr "1 ondertekening niet gecontroleerd wegens een fout\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d ondertekeningen niet gecontroleerd wegens fouten\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 gebruikersidentificatie gevonden zonder geldige zelfondertekening\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
@@ -2042,17 +2067,17 @@
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Reeds ondertekend met sleutel %08lx\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Niets te tekenen met sleutel %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2060,7 +2085,7 @@
 "Bent u er echt zeker van dat u deze sleutel wilt tekenen\n"
 "met uw sleutel: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2068,34 +2093,34 @@
 "Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "Echt tekenen? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "ondertekening mislukt: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "Deze sleutel is niet beveiligd.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:432
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "geheime sleutel niet beschikbaar"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "Sleutel is beveiligd.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan deze sleutel niet bewerken: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2103,7 +2128,7 @@
 "Geef de sleuteltekst voor deze geheime sleutel.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2111,421 +2136,426 @@
 "U wilt geen sleuteltekst - dit is waaschijnlijk een *slecht* idee!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "Wilt u dit echt? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr "sleutelondertekening naar de juiste plaats schuiven\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "beëindig dit menu"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr "bewaar"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "opslaan en beëindigen"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr "hulp"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "geef deze hulp"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr "toon vingerafdruk"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr "lijst"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
 msgstr "lijst van sleutel- en gebruikersidentificaties"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr "gebruikersidentificatie"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
 msgstr "selecteer gebruikersidentificatie N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr "sleutel"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "selecteer subsleutel N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr "controleer"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr "toon ondertekeningen"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr "onderteken"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr "onderteken de sleutel"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr "lteken"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
 msgstr "teken de sleutel lokaal"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
 msgstr "voeg een gebruikersidentificatie toe"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
 msgstr "verwijder gebruikersidentificatie"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr "voeg een secundaire sleutel toe"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "verwijder een secundaire sleutel"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
 msgstr "verwijder ondertekeningen"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr "verander de vervaldatum"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr "wissel"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "wissel tussen geheime en openbare sleutels"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606 g10/keyedit.c:607
 msgid "list preferences"
 msgstr "toon voorkeuren"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "pref"
+
+#: g10/keyedit.c:608
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:608
 msgid "change the passphrase"
 msgstr "verander de sleuteltekst"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "change the ownertrust"
 msgstr "verander het vertrouwen in de eigenaar"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revoke signatures"
 msgstr "roep ondertekeningen terug"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revoke a secondary key"
 msgstr "trek secundaire sleutel in"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable a key"
 msgstr "sta het gebruik van een sleutel niet toe"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable a key"
 msgstr "sta gebruik van een sleutel toe"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:633
 msgid "can't do that in batchmode\n"
 msgstr "kan dat niet doen in lopende band-modus\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:669
+#: g10/keyedit.c:671
 msgid "Secret key is available.\n"
 msgstr "Geheime sleutel is beschikbaar.\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:700
 msgid "Command> "
 msgstr "Commando> "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 msgid "Need the secret key to do this.\n"
 msgstr "Ik heb de geheime sleutel nodig om dat te doen.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:781
 msgid "Really sign all user IDs? "
 msgstr "Echt alle gebruikers tekenen? "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:782
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Hint: Selecteer de gebruikersidentificaties om te tekenen\n"
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:814 g10/keyedit.c:1000
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "bijwerken van de vertrouwensdatabase ging niet goed: %s\n"
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:825 g10/keyedit.c:846
 msgid "You must select at least one user ID.\n"
 msgstr "U moet op zijn minst een gebruikersidentificatie opgeven.\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:827
 msgid "You can't delete the last user ID!\n"
 msgstr "U kunt de laatste gebruiker niet verwijderen!\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:830
 msgid "Really remove all selected user IDs? "
 msgstr "Al deze gebruikers echt verwijderen? "
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:831
 msgid "Really remove this user ID? "
 msgstr "Deze gebruiker echt verwijderen? "
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:867 g10/keyedit.c:889
 msgid "You must select at least one key.\n"
 msgstr "U moet op zijn minst een sleutel selecteren.\n"
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:871
 msgid "Do you really want to delete the selected keys? "
 msgstr "Wilt u echt alle geselecteerde sleutels verwijderen? "
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:872
 msgid "Do you really want to delete this key? "
 msgstr "Wilt u deze sleutel echt verwijderen? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Wilt u echt alle geselecteerde sleutels intrekken? "
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:894
 msgid "Do you really want to revoke this key? "
 msgstr "Wilt u deze sleutel echt intrekken? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
 msgid "Save changes? "
 msgstr "Veranderingen bewaren? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:967
 msgid "Quit without saving? "
 msgstr "Beëindigen zonder te bewaren? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:978
 #, c-format
 msgid "update failed: %s\n"
 msgstr "bijwerken ging niet: %s\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:985
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "bijwerken van de geheime sleutel mislukte: %s\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:992
 msgid "Key not changed so no update needed.\n"
 msgstr "sleutel is niet veranderd en hoeft dus niet bijgewerkt te worden.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1007
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Foutief commando (probeer \"help\")\n"
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1090
+#: g10/keyedit.c:1140
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1144
 msgid "This key has been disabled"
 msgstr "Deze sleutel is niet beschikbaar"
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1173
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "sleutel %08lx: subsleutel is teruggeroepen!\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1176
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "nieuwe sleutelterugtrekkingen: %lu\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1178
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1420
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Verwijder deze goede ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1424
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Verwijder deze ongeldige ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1428
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Verwijder deze onbekende ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1434
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Deze zelfondertekening echt verwijderen? (j/N)"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1448
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d ondertekening verwijderd.\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1449
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d ondertekeningen verwijderd.\n"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1452
 msgid "Nothing deleted.\n"
 msgstr "Niets verwijderd.\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Haal a.u.b. de selecties weg voor de geheime sleutels.\n"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1527
 msgid "Please select at most one secondary key.\n"
 msgstr "Selecteer a.u.b. maximaal één secundaire sleutel.\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1531
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Vervaldatum voor secundaire sleutel instellen.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Vervaldatum voor primaire sleutel instellen.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1575
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "U kunt de vervaldatum van een v3 sleutel niet wijzigen\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1591
 msgid "No corresponding signature in secret ring\n"
 msgstr "Geen overeenkomende ondertekening in de geheime sleutelbos\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1652
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Geen gebruikersidentificatie met index %d\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1698
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Geen secundaire sleutel met index %d\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1796
 msgid "user ID: \""
 msgstr "gebruikersidentificatie: \""
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1799
 #, c-format
 msgid ""
 "\"\n"
@@ -2534,171 +2564,169 @@
 "\"\n"
 "tekende met uw sleutel %08lX op %s\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1803
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Terugtrekkingscertificaat maken voor deze ondertekening? (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1827
 msgid "You have signed these user IDs:\n"
 msgstr "U heeft deze gebruikers ondertekend:\n"
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   getekend door %08lX op %s\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1846
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   ingetrokken door %08lX op %s\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1866
 msgid "You are about to revoke these signatures:\n"
 msgstr "U staat op het punt om deze ondertekeningen in te trekken:\n"
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1884
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Echt deze terugtrekkingscertificaten aanmaken? (j/N)"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1913
 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:400 g10/mainproc.c:790
+#: g10/keylist.c:279 g10/mainproc.c:851
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Sleutel verloopt op %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:269
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "openbare sleutel is %08lX\n"
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:314
 msgid "public key encrypted data: good DEK\n"
 msgstr "gegevens versleuteld met een openbare sleutel: goede DEK\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:366
 #, 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:336
+#: g10/mainproc.c:376
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "versleuteld met %s sleutel, nummer %08lX\n"
 
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr "geheime sleutel voor ontsleuteling is niet beschikbaar\n"
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:390
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "openbare sleutel-ontsleuteling ging niet: %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:430
 msgid "decryption okay\n"
 msgstr "ontsleutelen ging goed\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:435
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "LET OP: het versleutelde bericht is veranderd!\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:440
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ontsleuteling mislukte: %s\n"
 
 # Dit kan wel Engels blijven.. toch?
-#: g10/mainproc.c:417
+#: g10/mainproc.c:459
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "LET OP: afzender vroeg om \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:461
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originele bestandsnaam='%.*s'\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:632
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "alleenstaande intrekking - gebruik \"gpg --import\" om uit te voeren\n"
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:719 g10/mainproc.c:728
 msgid "WARNING: invalid notation data found\n"
 msgstr "LET OP: ongeldige aantekeningen gevonden\n"
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:731
 msgid "Notation: "
 msgstr "Aantekening: "
 
-#: g10/mainproc.c:680
+#: g10/mainproc.c:740
 msgid "Policy: "
 msgstr "Beleid: "
 
-#: g10/mainproc.c:1121
+#: g10/mainproc.c:1193
 msgid "signature verification suppressed\n"
 msgstr "controle van de ondertekening overgeslagen\n"
 
-#: g10/mainproc.c:1158
+#. plaintext before signatures but no one-pass packets
+#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#, fuzzy
+msgid "can't handle these multiple signatures\n"
+msgstr "maak een losstaande ondertekening"
+
+#: g10/mainproc.c:1256
 #, 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:1184 g10/mainproc.c:1195
+#: g10/mainproc.c:1284 g10/mainproc.c:1292
 msgid "BAD signature from \""
 msgstr "FOUTE ondertekening van \""
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1196
+#: g10/mainproc.c:1285 g10/mainproc.c:1293
 msgid "Good signature from \""
 msgstr "Correcte ondertekening van \""
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1243
+#: g10/mainproc.c:1358
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ondertekening niet controleren: %s\n"
 
-#: g10/mainproc.c:1318
+#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "maak een losstaande ondertekening"
+
+#: g10/mainproc.c:1454
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "losstaande ondertekening van type 0x%02x\n"
 
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1511
 msgid "old style (PGP 2.x) signature\n"
 msgstr "oude stijl (PGP 2.x) ondertekening\n"
 
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1518
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ongeldig hoofdpakket gevonden in proc_tree()\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan geheugendumps niet uitzetten: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Experimentele algoritmes dienen niet gebruikt te worden!\n"
 
-#: g10/misc.c:234
-msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
+#: g10/misc.c:238
+#, fuzzy
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr "dit versleutelalgoritme is verouderd; gebruik een meer algemene!\n"
 
 #: g10/parse-packet.c:119
@@ -2706,12 +2734,68 @@
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan openbare sleutel-algoritme %d niet behandelen\n"
 
-#: g10/parse-packet.c:991
+#: g10/parse-packet.c:1010
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpakket type %d heeft kritische bit gezet\n"
 
-#: g10/passphrase.c:159
+#: g10/passphrase.c:223
+msgid "gpg-agent is not available in this session\n"
+msgstr ""
+
+#: g10/passphrase.c:229
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr ""
+
+#: g10/hkp.c:167 g10/passphrase.c:248
+#, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "kan geen verbinding maken met `%s': %s\n"
+
+#: g10/passphrase.c:313 g10/passphrase.c:576
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr " (hoofdsleutelnummer %08lX)"
+
+#: g10/passphrase.c:323
+#, fuzzy, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"\n"
+"U heeft een sleuteltekst nodig om de beveiliging voor de geheime\n"
+"sleutel voor gebruiker op te heffen: \""
+
+#: g10/passphrase.c:344
+#, fuzzy
+msgid "Enter passphrase\n"
+msgstr "Geef de sleuteltekst: "
+
+#: g10/passphrase.c:346
+#, fuzzy
+msgid "Repeat passphrase\n"
+msgstr "Herhaal de sleuteltekst: "
+
+#: g10/passphrase.c:384
+msgid "passphrase too long\n"
+msgstr ""
+
+#: g10/passphrase.c:396
+msgid "invalid response from agent\n"
+msgstr ""
+
+#: g10/passphrase.c:405
+msgid "cancelled by user\n"
+msgstr ""
+
+#: g10/passphrase.c:408 g10/passphrase.c:477
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr ""
+
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2721,25 +2805,20 @@
 "U heeft een sleuteltekst nodig om de beveiliging voor de geheime\n"
 "sleutel voor gebruiker op te heffen: \""
 
-#: g10/passphrase.c:168
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bit %s sleutel, nummer %08lX, gemaakt op %s"
 
-#: g10/passphrase.c:173
-#, c-format
-msgid " (main key ID %08lX)"
-msgstr " (hoofdsleutelnummer %08lX)"
-
-#: g10/passphrase.c:190
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
 msgstr "kan niet om wachtwoord vragen in lopende band-modus\n"
 
-#: g10/passphrase.c:194
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr "Geef de sleuteltekst: "
 
-#: g10/passphrase.c:198
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr "Herhaal de sleuteltekst: "
 
@@ -2748,19 +2827,24 @@
 msgstr ""
 "gegevens niet bewaard; gebruik de optie \"--output\" om het op te slaan in\n"
 
-#: g10/plaintext.c:324
+#: g10/plaintext.c:332
 msgid "Detached signature.\n"
 msgstr "Losstaande ondertekening.\n"
 
-#: g10/plaintext.c:328
+#: g10/plaintext.c:336
 msgid "Please enter name of data file: "
 msgstr "Geef de naam van het gegevensbestand: "
 
-#: g10/plaintext.c:349
+#: g10/plaintext.c:357
 msgid "reading stdin ...\n"
 msgstr "lezen uit standaard invoer ...\n"
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:391
+#, fuzzy
+msgid "no signed data\n"
+msgstr "kan ondertekende gegevens `%s' niet openen\n"
+
+#: g10/plaintext.c:399
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kan ondertekende gegevens `%s' niet openen\n"
@@ -2793,41 +2877,36 @@
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "LET OP: sleutel voor ondertekening is vervallen op %s\n"
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr "opvragen van sleutel %08lX van %s ...\n"
 
-#: g10/hkp.c:85
+#: g10/hkp.c:83
 #, 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:109 g10/hkp.c:148
+#: g10/hkp.c:102 g10/hkp.c:136
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "geen sleutelserver bekend (gebruik de optie --keyserver)\n"
 
-#: g10/hkp.c:117
+#: g10/hkp.c:110
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: ongeldig sleutelnummer\n"
 
-#: 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:194
+#: g10/hkp.c:191
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "fout bij versturen naar `%s': %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:203
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "versturen naar `%s' gelukt (status=%u)\n"
 
-#: g10/hkp.c:209
+#: g10/hkp.c:206
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "fout bij versturen naar `%s': status=%u\n"
@@ -2873,30 +2952,35 @@
 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:324
-#, c-format
-msgid "NOTE: signature key expired %s\n"
+#: g10/sig-check.c:328
+#, fuzzy, c-format
+msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "LET OP: sleutel voor ondertekening is vervallen op %s\n"
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "foutieve ondertekening aangenomen wegens een onbekende kritische bit\n"
 
-#: g10/sign.c:140
+#: g10/sign.c:152
+#, fuzzy, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "Kan ondertekening niet controleren: %s\n"
+
+#: g10/sign.c:161
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s ondertekening van: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:307 g10/sign.c:630
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan %s niet aanmaken: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:405
 msgid "signing:"
 msgstr "ondertekenen:"
 
-#: g10/sign.c:431
+#: g10/sign.c:448
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "LET OP: `%s' is een leeg bestand\n"
@@ -2936,7 +3020,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: map bestaat niet!\n"
 
-#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
+#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: kan hem niet aanmaken: %s\n"
@@ -3118,12 +3202,6 @@
 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"
@@ -3336,7 +3414,7 @@
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "LET OP: kan nog geen lange voorkeursblokken verwerken\n"
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -3346,7 +3424,7 @@
 "Onthoud dat het bestand met de ondertekening (.sig of .asc) het eerste\n"
 "bestand van de commandoregel moet zijn.\n"
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "invoerregel %u is te lang, of ontbrekende LF\n"
@@ -3356,41 +3434,51 @@
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: kan sleutelbos niet aanmaken: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1374
+#: g10/ringedit.c:319 g10/ringedit.c:1376
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: sleutelbos aangemaakt\n"
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1557
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "LET OP: er zijn 2 bestanden met vertrouwelijke informatie.\n"
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1558
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s is de onveranderde\n"
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1559
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s is de nieuwe\n"
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1560
 msgid "Please fix this possible security flaw\n"
 msgstr "Dicht dit mogelijke beveiligingsgat\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "sleutel is niet als onveilig gemarkeerd - kan hem niet gebruiken met "
 "nep-RNG!\n"
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, fuzzy, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "`%s' overgeslagen: %s\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' overgeslagen: %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+#, fuzzy
+msgid "skipped: secret key already present\n"
+msgstr "%s: overgeslagen: openbare sleutel is al aanwezig\n"
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3418,31 +3506,31 @@
 msgid "Enter new filename"
 msgstr "Geef een nieuwe bestandsnaam"
 
-#: g10/openfile.c:182
+#: g10/openfile.c:184
 msgid "writing to stdout\n"
 msgstr "naar standaard uitvoer schrijven\n"
 
-#: g10/openfile.c:261
+#: g10/openfile.c:273
 #, 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:311
+#: g10/openfile.c:323
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: nieuw optiebestand aangemaakt\n"
 
-#: g10/openfile.c:338
+#: g10/openfile.c:350
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: kan map niet aamaken: %s\n"
 
-#: g10/openfile.c:341
+#: g10/openfile.c:353
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: map aangemaakt\n"
 
-#: g10/openfile.c:343
+#: g10/openfile.c:355
 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"
@@ -3464,6 +3552,11 @@
 "LET OP: dit bericht werd versleuteld met een zwakke sleutel in het\n"
 "symmetrische versleutelalgoritme.\n"
 
+#: g10/encr-data.c:97
+#, fuzzy
+msgid "problem handling encrypted packet\n"
+msgstr "plaats geen sleutelidentificatieveld in versleutelde pakketten"
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "zwakke sleutel gemaakt - ik probeer het opnieuw\n"
@@ -3475,15 +3568,6 @@
 "kon het aanmaken van een zwakke sleutel voor het symmetrische\n"
 "algoritme niet voorkomen; ik heb het %d keer geprobeerd!\n"
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "er is een geheime sleutel voor deze openbare sleutel!\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr ""
-"gebruik eerst de optie \"--delete-secret-key\" om hem te verwijderen.\n"
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "kan dat niet doen in lopende band-mode zonder \"--yes\"\n"
@@ -3496,6 +3580,15 @@
 msgid "This is a secret key! - really delete? "
 msgstr "Dit is een geheime sleutel! - echt verwijderen? "
 
+#: g10/delkey.c:181
+msgid "there is a secret key for this public key!\n"
+msgstr "er is een geheime sleutel voor deze openbare sleutel!\n"
+
+#: g10/delkey.c:183
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr ""
+"gebruik eerst de optie \"--delete-secret-key\" om hem te verwijderen.\n"
+
 #: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
@@ -3745,6 +3838,26 @@
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Geen hulp beschikbaar voor `%s'"
+
+#, fuzzy
+#~ msgid "invalid"
+#~ msgstr "ongeldige versleuteling"
+
+#, fuzzy
+#~ msgid "revoked"
+#~ msgstr "revkey"
+
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "RSA sleutel kan niet gebruikt worden in deze versie\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Geen sleutel voor gebruikersidentificatie\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Geen gebruikersidentificatie voor sleutel\n"
+
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "geheime sleutel voor ontsleuteling is niet beschikbaar\n"
 
 #~ msgid ""
 #~ "RSA keys are deprecated; please consider creating a new key and use this key "
diff -urN gnupg-1.0.4/po/pl.po gnupg-1.0.5/po/pl.po
--- gnupg-1.0.4/po/pl.po	Tue Oct 17 15:40:39 2000
+++ gnupg-1.0.5/po/pl.po	Sun Apr 29 16:39:29 2001
@@ -1,14 +1,14 @@
 # Gnu Privacy Guard.
-# Copyright (C) 1998, 1999 Free Software Foundation, Inc.
-# Janusz A. Urbanowicz <alex@bofh.net.pl>, 1998, 1999.
+# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+# Janusz A. Urbanowicz <alex@bofh.net.pl>, 1999, 2000.
 #
-# To be included in GnuPG 1.0.1
+# To be included in GnuPG 1.0.5
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-10-16 19:22+0200\n"
-"PO-Revision-Date: 1999-12-05 21:29+01:00\n"
+"Project-Id-Version: gnupg-1.0.4\n"
+"POT-Creation-Date: 2001-04-29 16:39+0200\n"
+"PO-Revision-Date: 2001-04-21 01:03+02:00\n"
 "Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -27,35 +27,35 @@
 msgid "Warning: using insecure memory!\n"
 msgstr "Ostrze¿enie: u¿ywana pamiêæ nie jest pamiêci± bezpieczn±!\n"
 
-#: util/secmem.c:295
+#: util/secmem.c:299
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operacja niemo¿liwa do wykonania bez dostêpnej pamiêci bezpiecznej\n"
 
-#: util/secmem.c:296
+#: util/secmem.c:300
 msgid "(you may have used the wrong program for this task)\n"
-msgstr "(prawdopodobnie u¿ywany program jest niew³a¶ciwy dla tego zadania)\n"
+msgstr "(prawdopodobnie u¿ywany program jest niew³a¶ciwy dlatego zadania)\n"
 
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:287 util/miscutil.c:316
 msgid "yes"
 msgstr "tak"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:288 util/miscutil.c:319
 msgid "yY"
 msgstr "tT"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:289 util/miscutil.c:317
 msgid "no"
 msgstr "nie"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:290 util/miscutil.c:320
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:318
 msgid "quit"
 msgstr "wyj¶cie"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:321
 msgid "qQ"
 msgstr "wW"
 
@@ -101,7 +101,7 @@
 
 #: util/errors.c:64
 msgid "public key not found"
-msgstr "nie odnaleziono klucza publicznego"
+msgstr "klucz publiczny nie odnaleziony"
 
 #: util/errors.c:65
 msgid "unknown cipher algorithm"
@@ -129,7 +129,7 @@
 
 #: util/errors.c:71
 msgid "wrong secret key used"
-msgstr "u¿yty zosta³ niew³a¶ciwy klucz tajny"
+msgstr "zosta³ u¿yty niew³a¶ciwy klucz tajny"
 
 #: util/errors.c:72
 msgid "not supported"
@@ -137,7 +137,7 @@
 
 #: util/errors.c:73
 msgid "bad key"
-msgstr "niepoprawny klucz"
+msgstr "klucz niepoprawny"
 
 #: util/errors.c:74
 msgid "file read error"
@@ -213,7 +213,7 @@
 
 #: util/errors.c:92
 msgid "unexpected data"
-msgstr "nieoczekiwane dane"
+msgstr "nieoczekiowane dane"
 
 #: util/errors.c:93
 msgid "timestamp conflict"
@@ -241,7 +241,7 @@
 
 #: util/errors.c:99
 msgid "unsupported URI"
-msgstr "URI nie obs³ugiwanego typu"
+msgstr "URI nie jest obs³ugiwany"
 
 #: util/errors.c:100
 msgid "network error"
@@ -249,11 +249,20 @@
 
 #: util/errors.c:102
 msgid "not encrypted"
-msgstr "nie jest zaszyfrowany"
+msgstr "nie zaszyfrowany"
 
 #: util/errors.c:103
 msgid "not processed"
-msgstr "nie przetworzony"
+msgstr "nie zosta³ przetworzony"
+
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+msgid "unusable public key"
+msgstr "bezu¿yteczny klucz publiczny"
+
+#: util/errors.c:106
+msgid "unusable secret key"
+msgstr "bezu¿yteczny klucz tajny"
 
 #: util/logger.c:224
 #, c-format
@@ -265,65 +274,66 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "znalaz³e¶(a¶) b³±d w programie ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo¿na otworzyæ %s: %s\n"
 
-#: cipher/random.c:315
-#, fuzzy, c-format
+#: cipher/random.c:324
+#, c-format
 msgid "can't stat `%s': %s\n"
-msgstr "nie mo¿na otworzyæ %s: %s\n"
+msgstr "nie mo¿na sprawdziæ %s: %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:329
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
-msgstr ""
+msgstr "'%s' nie jest zwyk³ym plikiem - zostaje pominiêty\n"
 
-#: cipher/random.c:325
+#: cipher/random.c:334
 msgid "note: random_seed file is empty\n"
-msgstr ""
+msgstr "uwaga: plik random_seed jest pusty\n"
 
-#: cipher/random.c:331
+#: cipher/random.c:340
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
+"ostrze¿enie: plik random_seed ma niew³a¶ciwy rozmiar - nie zostanie u¿yty\n"
 
-#: cipher/random.c:339
-#, fuzzy, c-format
+#: cipher/random.c:348
+#, c-format
 msgid "can't read `%s': %s\n"
-msgstr "nie mo¿na otworzyæ %s: %s\n"
+msgstr "nie mo¿na odczytaæ %s: %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:386
 msgid "note: random_seed file not updated\n"
-msgstr ""
+msgstr "uwaga: plik random_seed nie jest uaktualniony\n"
 
-#: cipher/random.c:397
-#, fuzzy, c-format
+#: cipher/random.c:406
+#, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nie mo¿na stworzyæ %s: %s\n"
 
-#: cipher/random.c:404
-#, fuzzy, c-format
+#: cipher/random.c:413
+#, c-format
 msgid "can't write `%s': %s\n"
-msgstr "nie mo¿na otworzyæ %s: %s\n"
+msgstr "nie mo¿na zapisaæ %s: %s\n"
 
-#: cipher/random.c:407
-#, fuzzy, c-format
+#: cipher/random.c:416
+#, c-format
 msgid "can't close `%s': %s\n"
-msgstr "nie mo¿na otworzyæ %s: %s\n"
+msgstr "nie mo¿na zamkn±æ %s: %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:427
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
-msgstr ""
+msgstr "¿±danie zbyt wielu losowych bitów; ograniczenie wynosi %d\n"
 
-#: cipher/random.c:650
+#: cipher/random.c:661
 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:651
+#: cipher/random.c:662
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -349,7 +359,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:206
+#: g10/g10.c:216
 msgid ""
 "@Commands:\n"
 " "
@@ -357,139 +367,139 @@
 "@Polecenia:\n"
 " "
 
-#: g10/g10.c:208
+#: g10/g10.c:218
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z³o¿enie podpisu"
 
-#: g10/g10.c:209
+#: g10/g10.c:219
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z³o¿enie podpisu na czytelnym dokumencie"
 
-#: g10/g10.c:210
+#: g10/g10.c:220
 msgid "make a detached signature"
-msgstr "sporz±dzenie podpisu oddzielonego od dokumentu"
+msgstr "z³o¿enie podpisu oddzielonego od dokumentu"
 
-#: g10/g10.c:211
+#: g10/g10.c:221
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/g10.c:212
+#: g10/g10.c:222
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/g10.c:213
+#: g10/g10.c:223
 msgid "store only"
-msgstr "tylko zapis do pliku"
+msgstr "tylko zapis"
 
-#: g10/g10.c:214
+#: g10/g10.c:224
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy¶lnie)"
 
-#: g10/g10.c:215
+#: g10/g10.c:225
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/g10.c:217
+#: g10/g10.c:227
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/g10.c:219
+#: g10/g10.c:229
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpisów"
 
-#: g10/g10.c:220
+#: g10/g10.c:230
 msgid "check key signatures"
 msgstr "sprawdzenie podpisów kluczy"
 
-#: g10/g10.c:221
+#: g10/g10.c:231
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisków"
 
-#: g10/g10.c:222
+#: g10/g10.c:232
 msgid "list secret keys"
 msgstr "lista kluczy tajnych"
 
-#: g10/g10.c:223
+#: g10/g10.c:233
 msgid "generate a new key pair"
 msgstr "generacja nowej pary klucza"
 
-#: g10/g10.c:224
+#: g10/g10.c:234
 msgid "remove key from the public keyring"
 msgstr "usuniêcie klucza ze zbioru kluczy publicznych"
 
-#: g10/g10.c:226
+#: g10/g10.c:236
 msgid "remove key from the secret keyring"
 msgstr "usuniêcie klucza ze zbioru kluczy tajnych"
 
-#: g10/g10.c:227
+#: g10/g10.c:237
 msgid "sign a key"
 msgstr "z³o¿enie podpisu na kluczu"
 
-#: g10/g10.c:228
+#: g10/g10.c:238
 msgid "sign a key locally"
 msgstr "z³o¿enie lokalnego podpisu na kluczu"
 
-#: g10/g10.c:229
+#: g10/g10.c:239
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/g10.c:230
+#: g10/g10.c:240
 msgid "generate a revocation certificate"
-msgstr "tworzenie certyfikatu uniewa¿nienia klucza"
+msgstr "generacja certyfikatu uniewa¿nienia klucza"
 
-#: g10/g10.c:231
+#: g10/g10.c:241
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/g10.c:232
+#: g10/g10.c:242
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/g10.c:233
+#: g10/g10.c:243
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/g10.c:237
+#: g10/g10.c:247
 msgid "import/merge keys"
-msgstr "import/do³±czanie kluczy"
+msgstr "import/do³±czenie kluczy"
 
-#: g10/g10.c:239
+#: g10/g10.c:249
 msgid "list only the sequence of packets"
 msgstr "wypisane sekwencji pakietów"
 
-#: g10/g10.c:241
+#: g10/g10.c:251
 msgid "export the ownertrust values"
 msgstr "eksport warto¶ci zaufania"
 
-#: g10/g10.c:243
+#: g10/g10.c:253
 msgid "import ownertrust values"
 msgstr "wczytanie warto¶æi zaufania"
 
-#: g10/g10.c:245
+#: g10/g10.c:255
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/g10.c:247
+#: g10/g10.c:257
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAZWY]|sprawdzenie bazy zaufania"
 
-#: g10/g10.c:248
+#: g10/g10.c:258
 msgid "fix a corrupted trust database"
 msgstr "naprawa uszkodzonej bazy zaufania"
 
-#: g10/g10.c:249
+#: g10/g10.c:259
 msgid "De-Armor a file or stdin"
 msgstr "zdjêcie opakowania ASCII pliku lub potoku"
 
-#: g10/g10.c:251
+#: g10/g10.c:261
 msgid "En-Armor a file or stdin"
 msgstr "opakowanie ASCII pliku lub potoku"
 
-#: g10/g10.c:253
+#: g10/g10.c:263
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skróty wiadomo¶ci"
 
-#: g10/g10.c:257
+#: g10/g10.c:267
 msgid ""
 "@\n"
 "Options:\n"
@@ -499,158 +509,164 @@
 "Opcje:\n"
 " "
 
-#: g10/g10.c:259
+#: g10/g10.c:269
 msgid "create ascii armored output"
-msgstr "plik wynikowy bêdzie w opakowaniu ASCII"
+msgstr "plik wynikowy w opakowaniu ASCII"
 
-#: g10/g10.c:261
+#: g10/g10.c:271
 msgid "|NAME|encrypt for NAME"
-msgstr "|NAZWA|szyfrowanie dla adresata NAZWA"
+msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/g10.c:264
+#: g10/g10.c:274
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAZWA|u¿ycie NAZWA jako domy¶lnego adresata"
 
-#: g10/g10.c:266
+#: g10/g10.c:276
 msgid "use the default key as default recipient"
 msgstr "domy¶lny klucz jest domy¶lnym adresatem"
 
-#: g10/g10.c:270
+#: g10/g10.c:280
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/g10.c:271
+#: g10/g10.c:281
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - brak)"
 
-#: g10/g10.c:273
+#: g10/g10.c:283
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/g10.c:274
+#: g10/g10.c:284
 msgid "use as output file"
 msgstr "plik wyj¶ciowy"
 
-#: g10/g10.c:275
+#: g10/g10.c:285
 msgid "verbose"
 msgstr "z informacjami dodatkowymi"
 
-#: g10/g10.c:276
+#: g10/g10.c:286
 msgid "be somewhat more quiet"
 msgstr "mniej komunikatóww"
 
-#: g10/g10.c:277
+#: g10/g10.c:287
 msgid "don't use the terminal at all"
 msgstr "bez odwo³añ do terminala"
 
-#: g10/g10.c:278
+#: g10/g10.c:288
 msgid "force v3 signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpisów"
 
-#: g10/g10.c:279
+#: g10/g10.c:289
 msgid "always use a MDC for encryption"
 msgstr "do szyfrowania bêdzie u¿ywany MDC"
 
-#: g10/g10.c:280
+#: g10/g10.c:290
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:282
+#: g10/g10.c:292
+msgid "use the gpg-agent"
+msgstr "u¿yj gpg-agenta"
+
+#: g10/g10.c:293
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: ¿adnych pytañ"
 
-#: g10/g10.c:283
+#: g10/g10.c:294
 msgid "assume yes on most questions"
 msgstr "automatyczna odpowied¼ tak na wiêkszo¶æ pytañ"
 
-#: g10/g10.c:284
+#: g10/g10.c:295
 msgid "assume no on most questions"
 msgstr "automatyczna odpowied¼ nie na wiêkszo¶æ pytañ"
 
-#: g10/g10.c:285
+#: g10/g10.c:296
 msgid "add this keyring to the list of keyrings"
 msgstr "dodaæ zbiór kluczy do listy u¿ywanych"
 
-#: g10/g10.c:286
+#: g10/g10.c:297
 msgid "add this secret keyring to the list"
 msgstr "dodaæ zbiór kluczy tajnych do listy"
 
-#: g10/g10.c:287
+#: g10/g10.c:298
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|u¿ycie NAZWA jako domy¶lnego klucza tajnego"
 
-#: g10/g10.c:288
+#: g10/g10.c:299
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|serwer kluczy w którym bêd± poszukiwane"
 
-#: g10/g10.c:289
+#: g10/g10.c:300
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAZWA|zestaw znaków terminala NAZWA"
 
-#: g10/g10.c:290
+#: g10/g10.c:301
 msgid "read options from file"
 msgstr "wczytanie opcji z pliku"
 
-#: g10/g10.c:294
+#: g10/g10.c:305
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapisaæ opis stanu do FD"
 
-#: g10/g10.c:299
+#: g10/g10.c:310
 msgid "|KEYID|ulimately trust this key"
 msgstr "|KLUCZ|ca³kowite zaufanie dla tego klucza"
 
-#: g10/g10.c:300
+#: g10/g10.c:311
 msgid "|FILE|load extension module FILE"
 msgstr "|PLIK|³adowanie modu³u rozszerzenia z PLIK"
 
-#: g10/g10.c:301
+#: g10/g10.c:312
 msgid "emulate the mode described in RFC1991"
 msgstr "emulacja trybu opisanego w RFC1991"
 
-#: g10/g10.c:302
+#: g10/g10.c:313
 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:303
+#: g10/g10.c:314
 msgid "|N|use passphrase mode N"
 msgstr "|N|N-ty tryb wprowadzania wyra¿enia przej¶ciowego"
 
-#: g10/g10.c:305
+#: g10/g10.c:316
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|ALG|algorytm obliczania skrótów wiadomo¶ci ALG"
 
-#: g10/g10.c:307
+#: g10/g10.c:318
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ALG|algorytmu szyfruj±cy ALG dla has³a"
 
-#: g10/g10.c:308
+#: g10/g10.c:319
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|algorytm szyfruj±cy NAZWA"
 
-#: g10/g10.c:309
+#: g10/g10.c:320
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|algorytm obliczania skrótów wiadomo¶ci NAZWA"
 
-#: g10/g10.c:310
+#: g10/g10.c:321
 msgid "|N|use compress algorithm N"
 msgstr "|N|algorytm kompresji N"
 
-#: g10/g10.c:311
+#: g10/g10.c:322
 msgid "throw keyid field of encrypted packets"
 msgstr "usuniêcie identyfikatorów kluczy z pakietów"
 
-#: g10/g10.c:312
+#: g10/g10.c:323
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAZWA=TRE¦Æ|adnotacje"
 
-#: g10/g10.c:315
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
+"@\n"
+"(Pe³n± listê poleceñ i opcji mo¿na znale¼æ w podrêczniku systemowym.)\n"
 
-#: g10/g10.c:318
+#: g10/g10.c:329
 msgid ""
 "@\n"
 "Examples:\n"
@@ -671,15 +687,15 @@
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/g10.c:418
+#: g10/g10.c:438
 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:422
+#: g10/g10.c:442
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo³anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:425
+#: g10/g10.c:445
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -689,7 +705,7 @@
 "podpisywanie, sprawdzanie podpisów, szyfrowanie, deszyfrowanie\n"
 "domy¶lnie wykonywana operacja zale¿y od danych wej¶ciowych\n"
 
-#: g10/g10.c:432
+#: g10/g10.c:452
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -697,186 +713,190 @@
 "\n"
 "Obs³ugiwane algorytmy:\n"
 
-#: g10/g10.c:511
+#: g10/g10.c:531
 msgid "usage: gpg [options] "
 msgstr "wywo³anie: gpg [opcje]"
 
-#: g10/g10.c:564
+#: g10/g10.c:584
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/g10.c:704
+#: g10/g10.c:734
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy¶lnego pliku opcji '%s'\n"
 
-#: g10/g10.c:708
+#: g10/g10.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji '%s': %s\n"
 
-#: g10/g10.c:715
+#: g10/g10.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z '%s'\n"
 
-#: g10/g10.c:905
+#: g10/g10.c:950
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nie jest poprawn± nazw± zestawu znaków\n"
 
-#: g10/g10.c:970
+#: g10/g10.c:1024
 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
+#: g10/g10.c:1028 g10/g10.c:1037
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u¿ytku!\n"
 
-#: g10/g10.c:976
+#: g10/g10.c:1030
 #, c-format
 msgid "%s not allowed with %s!\n"
-msgstr "%s jest niedozwolony z %s!\n"
+msgstr "Nie wolno u¿ywaæ %s z %s!\n"
 
-#: g10/g10.c:979
+#: g10/g10.c:1033
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu z %s!\n"
 
-#: g10/g10.c:998 g10/g10.c:1010
+#: g10/g10.c:1053 g10/g10.c:1065
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj±cy jest niepoprawny\n"
 
-#: g10/g10.c:1004 g10/g10.c:1016
+#: g10/g10.c:1059 g10/g10.c:1071
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm geenracji skrótów wiadomo¶ci jest niepoprawny\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1075
 msgid "the given policy URL is invalid\n"
 msgstr "podany URL regulaminu jest niepoprawny\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1078
 #, 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:1025
+#: g10/g10.c:1080
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto¶æ completes-needed musi byæ wiêksza od 0\n"
 
-#: g10/g10.c:1027
+#: g10/g10.c:1082
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto¶æ marginals-needed musi byæ wiêksza od 1\n"
 
-#: g10/g10.c:1029
+#: g10/g10.c:1084
 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:1032
+#: g10/g10.c:1087
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:1036
+#: g10/g10.c:1091
 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:1121
+#: g10/g10.c:1176
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod³o siê: %s\n"
 
-#: g10/g10.c:1127
+#: g10/g10.c:1182
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:1134
+#: g10/g10.c:1189
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:1142
+#: g10/g10.c:1197
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1210
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1223
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1237
 msgid "--clearsign [filename]"
-msgstr "--clearsign [plik]"
+msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:1199
+#: g10/g10.c:1254
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1262
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u¿ytkownika"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1270
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u¿ytkownika"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1278
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u¿ytkownika [polecenia]"
 
-#: g10/g10.c:1239
+#: g10/g10.c:1294
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key nazwa u¿ytkownika"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1297
 msgid "--delete-key user-id"
 msgstr "--delete-key nazwa u¿ytkownika"
 
-#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
+#: g10/g10.c:1305
+msgid "--delete-secret-and-public-key user-id"
+msgstr "--delete-secret-and-public-key key nazwa u¿ytkownika"
+
+#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nie mo¿na otworzyæ %s: %s\n"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1357
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbiór kluczy]"
 
-#: g10/g10.c:1360
+#: g10/g10.c:1423
 #, c-format
 msgid "dearmoring failed: %s\n"
-msgstr "usuniêcie opakowania ASCII nie powiod³o siê: %s\n"
+msgstr "zdjêcie opakowania ASCII nie powiod³o siê: %s\n"
 
-#: g10/g10.c:1368
+#: g10/g10.c:1431
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod³o siê: %s\n"
 
-#: g10/g10.c:1439
+#: g10/g10.c:1502
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew³a¶ciwy algorytm skrótu '%s'\n"
 
-#: g10/g10.c:1520
+#: g10/g10.c:1589
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:1524
+#: g10/g10.c:1593
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj± wiadomo¶æ ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo¿na otworzyæ '%s'\n"
 
-#: g10/g10.c:1737
+#: g10/g10.c:1805
 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"
+msgstr "adnotacja musi zaczynaæ siê od podkre¶lenia lub litery\n"
 
-#: g10/g10.c:1743
+#: g10/g10.c:1811
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -884,87 +904,87 @@
 "nazwa adnotacji mo¿e zawieraæ tylko litery, cyfry, kropki,\n"
 "podkre¶lenia, i musi koñczyæ siê '='\n"
 
-#: g10/g10.c:1749
+#: g10/g10.c:1817
 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:1757
+#: g10/g10.c:1825
 msgid "a notation value must not use any control characters\n"
 msgstr "warto¶æ adnotacji nie mo¿e zawieraæ znaków steruj±cych\n"
 
-#: g10/armor.c:302
+#: g10/armor.c:306
 #, c-format
 msgid "armor: %s\n"
 msgstr "opakowanie: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:335
 msgid "invalid armor header: "
 msgstr "niepoprawny nag³ówek opakowania: "
 
-#: g10/armor.c:338
+#: g10/armor.c:342
 msgid "armor header: "
 msgstr "nag³ówek opakowania: "
 
-#: g10/armor.c:349
+#: g10/armor.c:353
 msgid "invalid clearsig header\n"
 msgstr "niew³a¶ciwy nag³ówek czytelnego podpisanego dokumentu\n"
 
-#: g10/armor.c:401
+#: g10/armor.c:405
 msgid "nested clear text signatures\n"
 msgstr "zagnie¿d¿one podpisy na czytelnym dokumencie\n"
 
-#: g10/armor.c:525
+#: g10/armor.c:529
 msgid "invalid dash escaped line: "
 msgstr "niepoprawne oznaczenie linii minusami: "
 
-#: g10/armor.c:537
+#: g10/armor.c:541
 msgid "unexpected armor:"
 msgstr "nieoczekiwane opakowanie:"
 
-#: g10/armor.c:654
+#: g10/armor.c:667 g10/armor.c:1235
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "niew³a¶ciwy znak formatu radix64 %02x zosta³ pominiêty\n"
 
-#: g10/armor.c:697
+#: g10/armor.c:710
 msgid "premature eof (no CRC)\n"
 msgstr "przewczesny koniec pliku (brak CRC)\n"
 
-#: g10/armor.c:731
+#: g10/armor.c:744
 msgid "premature eof (in CRC)\n"
 msgstr "przedwczesny koniec pliku (w CRC)\n"
 
-#: g10/armor.c:735
+#: g10/armor.c:748
 msgid "malformed CRC\n"
 msgstr "b³±d formatu CRC\n"
 
-#: g10/armor.c:739
+#: g10/armor.c:752 g10/armor.c:1272
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "B³±d sumy CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:772
 msgid "premature eof (in Trailer)\n"
-msgstr "przedwczesny koniec pliku (w zakoñczeniu)\n"
+msgstr "przedwczesny koniec pliku (w linii koñcz±cej)\n"
 
-#: g10/armor.c:760
+#: g10/armor.c:776
 msgid "error in trailer line\n"
 msgstr "b³±d w linii koñcz±cej\n"
 
-#: g10/armor.c:906
+#: g10/armor.c:922
 msgid "For info see http://www.gnupg.org"
-msgstr ""
+msgstr "Dalsze informacje znajduj± siê na http://www.gnupg.org/"
 
-#: g10/armor.c:1027
+#: g10/armor.c:1050
 msgid "no valid OpenPGP data found.\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/armor.c:1032
+#: g10/armor.c:1055
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "b³±d opakowania: linia d³u¿sza ni¿ %d znaków\n"
 
-#: g10/armor.c:1036
+#: g10/armor.c:1059
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -973,7 +993,7 @@
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "                  Odcisk:"
 
@@ -983,33 +1003,31 @@
 
 #: g10/pkclist.c:116
 msgid "No reason specified"
-msgstr ""
+msgstr "Nie podano przyczyny"
 
 #: g10/pkclist.c:118
-#, fuzzy
 msgid "Key is superseded"
-msgstr "Klucz jest chroniony.\n"
+msgstr "Klucz zosta³ zast±piony"
 
 #: g10/pkclist.c:120
-#, fuzzy
 msgid "Key has been compromised"
-msgstr "Ten klucz zosta³ wy³±czony z u¿ycia"
+msgstr "Klucz zosta³ skompromitowany"
 
 #: g10/pkclist.c:122
 msgid "Key is no longer used"
-msgstr ""
+msgstr "Klucz nie jest ju¿ u¿ywany"
 
 #: g10/pkclist.c:124
 msgid "User ID is no longer valid"
-msgstr ""
+msgstr "Identyfikator u¿ytkownika przesta³ byæ poprawny"
 
 #: g10/pkclist.c:128
 msgid "Reason for revocation: "
-msgstr ""
+msgstr "Powód uniewa¿nienia: "
 
 #: g10/pkclist.c:145
 msgid "Revocation comment: "
-msgstr ""
+msgstr "Komentarz do uniewa¿nienia: "
 
 #. a string with valid answers
 #: g10/pkclist.c:303
@@ -1105,7 +1123,7 @@
 
 #: g10/pkclist.c:464 g10/pkclist.c:476 g10/pkclist.c:598
 msgid "Use this key anyway? "
-msgstr "U¿yæ tego klucza mimo wszystko? "
+msgstr "U¿yæ tego klucza pomimo to? "
 
 #: g10/pkclist.c:469
 #, c-format
@@ -1198,69 +1216,68 @@
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
-"OSTRZE¯ENIE: Ten klucz nie jest po¶wiadczony wystarczaj±co zaufanymi "
-"podpisami!\n"
+"OSTRZE¯ENIE: Tego klucza nie po¶wiadczaj± wystarczaj±c zaufanyne podpisy!\n"
 
 #: g10/pkclist.c:717
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
-"             Nie ma pewno¶ci ¿e ten podpis zosta³ z³o¿ony przez "
+"             Nie ma pewno¶ci ¿e ten podpis zosta³ z³o¿nony przez "
 "w³a¶ciciela.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: pominiêty: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: pominiêty: klucz publiczny ju¿ znajduje siê w bazie\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
 msgstr ""
-"Nie poda³e¶(a¶) identyfikatora u¿ytkownika (user ID).\n"
+"Nie poda³e¶ identyfikatora u¿ytkownika (user ID). \n"
 "Mo¿na to zrobiæ za pomoc± opcji \"-r\".\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "Wprowad¼ identyfikator u¿ytkownika (user ID): "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "Brak takiego identyfikatora u¿ytkownika.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 msgid "skipped: public key already set as default recipient\n"
 msgstr "pominiêty: klucz publiczny ju¿ jest domy¶lnym adresatem\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
 msgstr "Klucz publiczny wy³±czony z uzycia.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "pominiêty: klucz publiczny ju¿ wybrany w --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "nieznany domy¶lny adresat '%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: b³±d podczas sprawdzania klucza: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: pominiêty: klucz publiczny wy³±czony z u¿ycia\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adresów\n"
 
@@ -1268,62 +1285,66 @@
 msgid "writing self signature\n"
 msgstr "zapis podpisu klucza nim samym\n"
 
-#: g10/keygen.c:214
+#: g10/keygen.c:217
 msgid "writing key binding signature\n"
 msgstr "zapis podpisu wi±¿±cego klucz\n"
 
-#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
-#, fuzzy, c-format
+#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
+#, c-format
 msgid "keysize invalid; using %u bits\n"
-msgstr "¯±dana d³ugo¶æ klucza to %u bity.\n"
+msgstr "niew³a¶ciwa d³ugo¶æ klucza; wykorzystano %u bitów\n"
 
-#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
-#, fuzzy, c-format
+#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
+#, c-format
 msgid "keysize rounded up to %u bits\n"
-msgstr "zaokr±glono do %u bitów\n"
+msgstr "rozmair klucza zaokr±glony do %u bitów\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:549
 msgid "Please select what kind of key you want:\n"
 msgstr "Proszê wybraæ rodzaj klucza:\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:551
 #, 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:543
+#: g10/keygen.c:552
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:554
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowanie)\n"
 
-#: g10/keygen.c:546
+#: g10/keygen.c:555
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (do szyfrowania i podpisywania)\n"
 
-#: g10/keygen.c:548
-#, fuzzy, c-format
+#: g10/keygen.c:557
+#, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) Klucz dla algorytmu ElGamala (do szyfrowania i podpisywania)\n"
+msgstr "   (%d) Klucz dla algorytmu RSA (do szyfrowania i podpisywania)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:561
 msgid "Your selection? "
 msgstr "Twój wybór? "
 
-#: g10/keygen.c:563 g10/keygen.c:571
+#: g10/keygen.c:572
 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:585
+#: g10/keygen.c:580
+msgid "The use of this algorithm is deprecated - create anyway? "
+msgstr "U¿ywanie tego algorytmu jest odradzane - tworzyæ mimo to? "
+
+#: g10/keygen.c:594
 msgid "Invalid selection.\n"
 msgstr "Niew³a¶ciwy wybór.\n"
 
-#: g10/keygen.c:597
+#: g10/keygen.c:606
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1336,22 +1357,22 @@
 "               domy¶lny rozmiar klucza wynosi 1024 bity\n"
 "  najwiêkszy sugerowany rozmiar klucza wynosi 2048 bitów\n"
 
-#: g10/keygen.c:604
+#: g10/keygen.c:613
 msgid "What keysize do you want? (1024) "
 msgstr "Jakiej d³ugo¶ci klucz wygenerowaæ? (1024) "
 
-#: g10/keygen.c:609
+#: g10/keygen.c:618
 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:611
+#: g10/keygen.c:620
 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:613
-#, fuzzy
+#: g10/keygen.c:622
 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"
+msgstr ""
+"D³ugo¶æ klucza zbyt ma³a; minimalna dopuszczalna dla RSA wynosi 1024 bity.\n"
 
 #. It is ridiculous and an annoyance to use larger key sizes!
 #. * GnuPG can handle much larger sizes; but it takes an eternity
@@ -1361,12 +1382,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:624
+#: g10/keygen.c:633
 #, 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:629
+#: g10/keygen.c:638
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1374,11 +1395,11 @@
 "Klucze d³u¿sze ni¿ 2048 bitów s± odradzane, poniewa¿ obliczenia\n"
 "trwaj± wtedy BARDZO d³ugo!\n"
 
-#: g10/keygen.c:632
+#: g10/keygen.c:641
 msgid "Are you sure that you want this keysize? "
 msgstr "Na pewno wygenerowaæ klucz takiej d³ugo¶ci? "
 
-#: g10/keygen.c:633
+#: g10/keygen.c:642
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1386,21 +1407,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:641
+#: g10/keygen.c:650
 msgid "Do you really need such a large keysize? "
 msgstr "Czy naprawdê potrzebujesz takiego d³ugiego klucza? "
 
-#: g10/keygen.c:647
+#: g10/keygen.c:656
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "¯±dana d³ugo¶æ klucza to %u bity.\n"
 
-#: g10/keygen.c:650 g10/keygen.c:654
+#: g10/keygen.c:659 g10/keygen.c:663
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr±glono do %u bitów\n"
 
-#: g10/keygen.c:702
+#: g10/keygen.c:711
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1416,37 +1437,37 @@
 "      <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:717
+#: g10/keygen.c:726
 msgid "Key is valid for? (0) "
 msgstr "Okres wa¿no¶ci klucza ? (0) "
 
-#: g10/keygen.c:722
+#: g10/keygen.c:731
 msgid "invalid value\n"
 msgstr "niepoprawna warto¶æ\n"
 
-#: g10/keygen.c:727
+#: g10/keygen.c:736
 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:733
+#: g10/keygen.c:742
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Data wa¿no¶ci klucza: %s\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:745
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
-"Twój system nie potrafi poprawnie wy¶wietlaæ dat po roku 2036.\n"
-"Jednak¿e poprawnie obs³ugiwane s± daty do roku 2106.\n"
+"Twój system nie potrafi pokazaæ daty po roku 2038.\n"
+"Niemniej daty do roku 2106 bêd± poprawnie obs³ugiwane.\n"
 
-#: g10/keygen.c:741
+#: g10/keygen.c:750
 msgid "Is this correct (y/n)? "
 msgstr "Dane poprawne (t/n)? "
 
-#: g10/keygen.c:784
+#: g10/keygen.c:793
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1459,47 +1480,47 @@
 "Musisz okre¶liæ identyfikator u¿ytkownika aby mo¿na by³o rozpoznaæ twój\n"
 "klucz; program z³o¿y go z twojego imienia i nazwiska, komentarza i adresu\n"
 "poczty elektronicznej. Bêdzie on mia³ tak± postaæ:\n"
-"    \"Tadeusz ¯eleñski (Boy) <tzb@provider.com.pl>\"\n"
+"    \"Tadeusz ¯eleñski (Boy) <tzb@domena.pl>\"\n"
 "\n"
 
-#: g10/keygen.c:796
+#: g10/keygen.c:805
 msgid "Real name: "
 msgstr "Imiê i nazwisko: "
 
-#: g10/keygen.c:804
+#: g10/keygen.c:813
 msgid "Invalid character in name\n"
 msgstr "Niew³a¶ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:806
+#: g10/keygen.c:815
 msgid "Name may not start with a digit\n"
 msgstr "Imiê lub nazwisko nie mo¿e zaczynaæ siê od cyfry\n"
 
-#: g10/keygen.c:808
+#: g10/keygen.c:817
 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:816
+#: g10/keygen.c:825
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:827
+#: g10/keygen.c:836
 msgid "Not a valid email address\n"
-msgstr "to nie jest poprawny adres poczty elektronicznej\n"
+msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:835
+#: g10/keygen.c:844
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:841
+#: g10/keygen.c:850
 msgid "Invalid character in comment\n"
 msgstr "Niew³a¶ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:864
+#: g10/keygen.c:873
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "U¿ywasz zestawu znaków %s.\n"
 
-#: g10/keygen.c:870
+#: g10/keygen.c:879
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1510,58 +1531,59 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:883
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
+"Nie nalezy umieszczaæ adresu poczty elektronicznej w polu nazwiska czy\n"
+"komentarza.\n"
 
-#: g10/keygen.c:879
+#: g10/keygen.c:888
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:889
-#, fuzzy
+#: g10/keygen.c:898
 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? "
+"czy (W)yj¶æ? "
 
-#: g10/keygen.c:890
+#: g10/keygen.c:899
 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? "
+"przej¶æ (D)alej czy (W)yj¶æ z programu ? "
 
-#: g10/keygen.c:909
+#: g10/keygen.c:918
 msgid "Please correct the error first\n"
-msgstr ""
+msgstr "Najpierw trzeba poprawiæ ten b³±d\n"
 
-#: g10/keygen.c:947
+#: g10/keygen.c:956
 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:955
+#: g10/keyedit.c:469 g10/keygen.c:964
 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:961
+#: g10/keygen.c:970
 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"
 "using this program with the option \"--edit-key\".\n"
 "\n"
 msgstr ""
-"Nie chcesz podaæ wyra¿enia przej¶ciowego (has³a) - to *z³y* pomys³!\n"
+"Nie chcesz podaæ wyra¿enia przej¶ciowego (has³a) - to z³y pomys³!\n"
 "W ka¿dej chwili mo¿esz ustawiæ wyra¿enie przej¶ciowe u¿ywaj±c tego programu\n"
 "i opcji \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:982
+#: g10/keygen.c:991
 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"
@@ -1571,33 +1593,33 @@
 "Musimy wygenerowaæ du¿o losowych bajtów. Dobrym pomys³em podczas "
 "generowania\n"
 "liczb pierszych jest wykonanywanie w tym czasie innych dzia³añ (pisanie na\n"
-"klawiaturzeze, poruszanie myszk±, odwo³anie siê do dysków); dziêki temu\n"
-"generator liczb losowych ma mo¿liwo¶æ zebrania odpowiedniej ilo¶ci entropii. "
-"\n"
+"klawiaturze, poruszanie myszk±, odwo³anie siê do dysków); dziêki temu\n"
+"generator liczb losowych ma mo¿liwo¶æ zebrania odpowiedniej ilo¶ci "
+"entropii.\n"
 
-#: g10/keygen.c:1431
+#: g10/keygen.c:1440
 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:1474
+#: g10/keygen.c:1483
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta³a anulowana.\n"
 
-#: g10/keygen.c:1571
-#, fuzzy, c-format
+#: g10/keygen.c:1581
+#, c-format
 msgid "writing public key to `%s'\n"
-msgstr "zapis certyfikatu publicznego w '%s'\n"
+msgstr "zapisujê klucz publiczny w '%s'\n"
 
-#: g10/keygen.c:1572
-#, fuzzy, c-format
+#: g10/keygen.c:1582
+#, c-format
 msgid "writing secret key to `%s'\n"
-msgstr "zapis tajnego certyfikatu w '%s'\n"
+msgstr "zapisujê klucz tajny w '%s'\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1679
 msgid "public and secret key created and signed.\n"
-msgstr "klucze publiczny i tajny zosta³y stworzone i podpisane.\n"
+msgstr "tajny i publiczny klucz zosta³y utworzone i podpisane.\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1684
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1605,20 +1627,20 @@
 "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:1690 g10/keygen.c:1791
+#: g10/keygen.c:1701 g10/keygen.c:1807
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod³a siê: %s\n"
 
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1748 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 ""
-"klucz zosta³ stworzony %lu sekund w przysz³o¶ci (zaburzenia\n"
+"klucz zosta³ stworzony %lu sekundê w przysz³o¶ci (zaburzenia\n"
 "czasoprzestrzeni, lub ¼le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1750 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1626,11 +1648,11 @@
 "klucz zosta³ stworzony %lu sekund w przysz³o¶ci (zaburzenia\n"
 "czasoprzestrzeni, lub ¼le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1783
 msgid "Really create? "
-msgstr "Na pewno generowaæ? "
+msgstr "Na pewno utworzyæ? "
 
-#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1641,17 +1663,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:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: OSTRZE¯ENIE: plik jest pusty\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "odczyt z '%s'\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s zaszyfrowany dla: %s\n"
@@ -1659,7 +1681,7 @@
 #: g10/export.c:153
 #, c-format
 msgid "%s: user not found: %s\n"
-msgstr "%s: nie znaleziono u¿ytkownika: %s\n"
+msgstr "%s: nie znaleziono u¿ytkownika %s\n"
 
 #: g10/export.c:162
 #, c-format
@@ -1672,289 +1694,286 @@
 msgstr "klucz %08lX: nie jest w formacie RFC 2440 - pominiêty\n"
 
 #: g10/export.c:182
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: not protected - skipped\n"
-msgstr "klucz %08lX: nie jest w formacie RFC 2440 - pominiêty\n"
+msgstr "klucz %08lX: nie jest chroniony - pominiêty\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr "OSTRZE¯ENIE: nic nie zosta³o wyeksportowane!\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:214
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zbyt wiele wpisów w buforze kluczy publicznych - wy³±czony\n"
 
-#: g10/getkey.c:350
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+msgid "[User id not found]"
+msgstr "[brak identyfikatora u¿ytkownika]"
+
+#: g10/getkey.c:453
 msgid "too many entries in unk cache - disabled\n"
 msgstr "zbyt wiele wpisów w buforze nieznanych kluczy - wy³±czony\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr "W tej wersji nie mo¿na u¿ywaæ kluczy RSA\n"
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
-msgstr "Brak klucza z takim identyfikatorem u¿ytkownika.\n"
-
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
-msgstr "Brak identyfikatora u¿ytkownika dla klucza.\n"
-
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2207
 #, 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:2050
-#, fuzzy
-msgid "[User id not found]"
-msgstr "%s: nie znaleziono u¿ytkownika\n"
+#: g10/getkey.c:2249 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/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d zostaje pominiêty\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 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:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "b³±d odczytu '%s': %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Ogó³em przetworzonych kluczy: %lu\n"
 
-#: g10/import.c:206
-#, fuzzy, c-format
+#: g10/import.c:208
+#, c-format
 msgid "      skipped new keys: %lu\n"
-msgstr "            nowych podkluczy: %lu\n"
+msgstr "   pominiêtych nowych kluczy: %lu\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identyfikatora: %lu\n"
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr "         do³±czono do zbioru: %lu"
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   bez zmian: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nowych identyfikatorów: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "            nowych podkluczy: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "             nowych podpisów: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nowych uniewa¿nieñ kluczy: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   tajnych kluczy wczytanych: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "     tajnych kluczy dodanych: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    tajnych kluczy bez zmian: %lu\n"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "klucz %08lX: brak identyfikatora u¿ytkownika\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "klucz %08lX: brak poprawnych identyfikatorów u¿ytkownika\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 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:418 g10/import.c:657
+#: g10/import.c:435 g10/import.c:684
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 
-#: g10/import.c:423
-#, fuzzy, c-format
+#: g10/import.c:440
+#, c-format
 msgid "key %08lX: new key - skipped\n"
-msgstr "klucz %08lX: nie jest w formacie RFC 2440 - pominiêty\n"
+msgstr "klucz %08lX: nowy klucz - pominiêty\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "brak domy¶lnego zbioru kluczy publicznych\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "nie mo¿na zablokowaæ zbioru kluczy publicznych '%s': %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "b³±d zapisu zbioru kluczy '%s': %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
-msgstr "klucz %08lX: klucz publiczny do³±czony do zbioru\n"
+msgstr "klucz %08lX: klucz publiczny wczytano do zbioru\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, 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:472 g10/import.c:665
+#: g10/import.c:489 g10/import.c:692
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:478 g10/import.c:671
+#: g10/import.c:495 g10/import.c:698
 #, 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:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "klucz %08lX: 1 nowy identyfikator u¿ytkownika\n"
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "klucz %08lX: %d nowych identyfikatorów u¿ytkownika\n"
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "klucz %08lX: 1 nowy podpis\n"
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "klucz %08lX: %d nowych podpisów\n"
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "klucz %08lX: 1 nowy podklucz\n"
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "klucz %08lX: %d nowych podkluczy\n"
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "klucz %08lX: bez zmian\n"
 
-#: g10/import.c:613
+#: g10/import.c:610
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr "klucz tajny %08lX nie zosta³ wczytany (aby to zrobiæ u¿yj %s)\n"
+
+#: g10/import.c:640
 #, 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:617
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "Klucz %08lX: ten klucz ju¿ znajduje siê w zbiorze\n"
 
-#: g10/import.c:622
+#: g10/import.c:649
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "klucz %08lX: brak klucza tajnego: %s\n"
 
-#: g10/import.c:651
+#: g10/import.c:678
 #, 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:682
+#: g10/import.c:709
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
-msgstr ""
-"klucz %08lX: niepoprawny certyfikat uniewa¿nienia:\n"
-"%s - odrzucony\n"
+msgstr "klucz %08lX: niepoprawny certyfikat uniewa¿nienia: %s - odrzucony\n"
 
-#: g10/import.c:714
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "klucz %08lX: wczytany certyfikat uniewa¿nienia\n"
 
-#: g10/import.c:756
+#: g10/import.c:783
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "klucz %08lX: brak identyfikatora u¿ytkownika do podpisu\n"
 
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:790 g10/import.c:814
 #, 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:764
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "klucz %08lX: niepoprawny podpis w³a¶ciciela klucza\n"
 
-#: g10/import.c:779
+#: g10/import.c:806
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "klucz %08lX: brak podklucza do dowi±zania\n"
 
-#: g10/import.c:788
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "klucz %08lX: niepoprawne dowi±zanie podklucza\n"
 
-#: g10/import.c:815
+#: g10/import.c:842
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "klucz %08lX: przyjêto identyfikator nie podpisany nim samym '"
 
-#: g10/import.c:844
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "klucz %08lX: pominiêto identyfikator u¿ytkownika '"
 
-#: g10/import.c:867
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "klucz %08lX: podklucz pominiêty\n"
@@ -1963,83 +1982,83 @@
 #. * 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:892
+#: g10/import.c:919
 #, 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:901
+#: g10/import.c:928
 #, 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:909
+#: g10/import.c:936
 #, 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:1009
+#: g10/import.c:1036
 #, 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:1060
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "klucz %08lX: dodany certyfikat uniewa¿nienia\n"
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "klucz %08lX: dostêpna kopia nie jest podpisana ni± sam±\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: nie znaleziono u¿ytkownika\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr "[uniewa¿nienie]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr "[podpis klucza nim samym]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
 msgstr "1 niepoprawny podpis\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d niepoprawnych podpisów\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis nie zosta³ sprawdzony z powodu braku klucza\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d podpisów nie zosta³o sprawdzonych z powodu braku kluczy\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis nie zosta³ sprawdzony z powodu b³êdu\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpisów nie sprawdzonych z powodu b³êdów\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "wykryto 1 identyfikator u¿ytkownika bez podpisu w³a¶ciciela klucza\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
@@ -2047,25 +2066,25 @@
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Ju¿ podpisano kluczem %08lX.\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr ""
-"Czy jeste¶ naprawdê pewien ¿e chcesz podpisaæ ten klucz\n"
+"Czy jeste¶ naprawdê pewien ¿e chcesz podpisaæ ten klucz \n"
 "swoim kluczem: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2073,34 +2092,33 @@
 "Podpis zostanie oznaczony jako nieeksportowalny.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "Na pewno podpisaæ? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z³o¿enie podpisu nie powiod³o siê: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:431
-#, fuzzy
+#: g10/keyedit.c:432
 msgid "Secret parts of primary key are not available.\n"
-msgstr "klucz tajny nie jest dostêpny"
+msgstr "Czê¶æ tajna g³ównego klucza jest niedostêpna.\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tego klucza nie mo¿na edytowaæ: %s.\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2108,7 +2126,7 @@
 "Wprowad¼ nowe wyra¿enie przej¶ciowe (has³o) dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2116,422 +2134,426 @@
 "Nie chcesz podaæ wyra¿enia przej¶ciowego (has³a) - to *z³y* pomys³!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "Czy na pewno chcesz to zrobiæ? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
-msgstr "przeniesienie podpis klucza na w³a¶ciwe miejsce\n"
+msgstr "przenoszê podpis klucza na w³a¶ciwe miejsce\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "wyj¶cie z tego menu"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr "w"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr "zapis"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "zapis zmian i wyj¶cie"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr "pomoc"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr "odc"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr "lista"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
 msgstr "lista kluczy i identyfikatorów u¿ytkowników"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr "id"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
 msgstr "wybór identyfikatora u¿ytkownika N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr "klucz"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "wybór podklucza N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr "lista"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr "lista podpisów"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr "l"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr "podpis"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr "z³o¿enie podpisu na kluczu"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr "p"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr "lpodpis"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
 msgstr "z³o¿enie lokalnego podpisu na kluczu"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
-msgstr "¶ledzenie"
+msgstr "¶ledzenia"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr "dodid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
 msgstr "dodanie nowego identyfikatora u¿ytkownika do klucza"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr "usid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
 msgstr "usuniêcie identyfikatora u¿ytkownika z klucza"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr "dodkl"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr "dodanie podklucza"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr "uskl"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "usuniêcie podklucza"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
-msgstr "lpodpis"
+msgstr "uspod"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
-msgstr "lista podpisów"
+msgstr "usuniêcie podpisów"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr "data"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr "zmiana daty wa¿no¶ci klucza"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr "prze³"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "prze³±czenie pomiêdzy list± kluczy publicznych i tajnych"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr "p"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr "opcje"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606 g10/keyedit.c:607
 msgid "list preferences"
 msgstr "lista opcji"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "opcje"
+
+#: g10/keyedit.c:608
 msgid "passwd"
 msgstr "has³o"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:608
 msgid "change the passphrase"
 msgstr "zmiana wyra¿enia przej¶ciowego (has³a)"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "trust"
 msgstr "zaufanie"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "change the ownertrust"
 msgstr "zmiana zaufania w³a¶ciciela"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revsig"
 msgstr "unpod"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revoke signatures"
 msgstr "uniewa¿nienie podpisu"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revkey"
 msgstr "unpkl"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revoke a secondary key"
 msgstr "uniewa¿nienie podklucza"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable"
 msgstr "wy³kl"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable a key"
 msgstr "wy³±czyæ klucz z u¿ycia"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable"
 msgstr "w³kl"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable a key"
 msgstr "w³±czyæ klucz do u¿ycia"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:633
 msgid "can't do that in batchmode\n"
 msgstr "nie dzia³a w trybie wsadowym\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:669
+#: g10/keyedit.c:671
 msgid "Secret key is available.\n"
 msgstr "Dostêpny jest klucz tajny.\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:700
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Please use the command \"toggle\" first.\n"
-msgstr ""
+msgstr "Najpierw trzeba u¿yæ polecenia \"prze³\".\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:781
 msgid "Really sign all user IDs? "
 msgstr "Podpisaæ wszystkie identyfikatory u¿ytkownika na tym kluczu? "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:782
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Podpowied¼: wybierz identyfikatory u¿ytkownika do podpisania.\n"
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:814 g10/keyedit.c:1000
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "naniesienie poprawek bazy zaufania nie powiod³o siê: %s\n"
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:825 g10/keyedit.c:846
 msgid "You must select at least one user ID.\n"
 msgstr "Musisz wybraæ co najmniej jeden identyfikator u¿ytkownika.\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:827
 msgid "You can't delete the last user ID!\n"
 msgstr "Nie mo¿esz usun±æ ostatniego identyfikatora u¿ytkownika!\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:830
 msgid "Really remove all selected user IDs? "
 msgstr "Czy na pewno usun±æ wszystkie wybrane identyfikatory u¿ytkownika? "
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:831
 msgid "Really remove this user ID? "
 msgstr "Czy na pewno usun±æ ten identyfikator u¿ytkownika? "
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:867 g10/keyedit.c:889
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybraæ co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:871
 msgid "Do you really want to delete the selected keys? "
 msgstr "Czy na pewno chcesz usun±æ wybrane klucze? "
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:872
 msgid "Do you really want to delete this key? "
 msgstr "Czy na pewno chcesz usun±æ ten klucz? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Czy na pewno chcesz uniewa¿niæ wybrane klucze? "
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:894
 msgid "Do you really want to revoke this key? "
 msgstr "Czy na pewno chcesz uniewa¿niæ ten klucz? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
 msgid "Save changes? "
 msgstr "Zapisaæ zmiany? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:967
 msgid "Quit without saving? "
 msgstr "Wyj¶æ bez zapisania zmian? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:978
 #, c-format
 msgid "update failed: %s\n"
 msgstr "naniesienie poprawek nie powiod³o siê: %s\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:985
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "naniesienie poprawek na kluczu tajnym nie powiod³o siê: %s\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:992
 msgid "Key not changed so no update needed.\n"
 msgstr ""
-"Klucz nie zosta³ zmieniony wiêc nanoszenie poprawek nie jest konieczne.\n"
+"Klucz nie zosta³ zmieniony wiêc naniesienie poprawek nie jest konieczne.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1007
 msgid "Invalid command  (try \"help\")\n"
-msgstr "Niepoprawne polecenie  (spróbuj \"help\")\n"
+msgstr "Niepoprawna komenda  (spróbuj \"help\")\n"
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
-msgstr ""
+msgstr "%s%c %4u%c/%08lX  utworzony: %s wygasa %s"
 
-#: g10/keyedit.c:1090
+#: g10/keyedit.c:1140
 #, c-format
 msgid " trust: %c/%c"
-msgstr ""
+msgstr "zaufanie: %c/%c"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1144
 msgid "This key has been disabled"
-msgstr "Ten klucz zosta³ wy³±czony z u¿ycia"
+msgstr "Ten klucz zosta³ wy³±czony z u¿ytku"
 
-#: g10/keyedit.c:1123
-#, fuzzy, c-format
+#: g10/keyedit.c:1173
+#, c-format
 msgid "rev! subkey has been revoked: %s\n"
-msgstr "klucz %08lX: podklucz zosta³ uniewa¿niony!\n"
+msgstr "podklucz zosta³ uniewa¿niony: %s\n"
 
-#: g10/keyedit.c:1126
-#, fuzzy
+#: g10/keyedit.c:1176
 msgid "rev- faked revocation found\n"
-msgstr "   nowych uniewa¿nieñ kluczy: %lu\n"
+msgstr "fa³szywy certyfikat uniewa¿nienia\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1178
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
-msgstr ""
+msgstr "problem przy sprawdzaniu uniewa¿nienia: %s\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1420
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun±æ ten poprawny podpis? (t/N/w)"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1424
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun±æ ten niepoprawny podpis? (t/N/w)"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1428
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun±æ ten nieznany podpis? (t/N/w)"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1434
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun±æ ten podpis klucza nim samym? (t/N)"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1448
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuniêty.\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1449
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpisów usuniêtych.\n"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1452
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta³o usuniête.\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Proszê usun±æ znacznik wyboru z kluczy tajnych.\n"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1527
 msgid "Please select at most one secondary key.\n"
 msgstr "Proszê wybraæ najwy¿ej jeden podklucz.\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1531
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Zmiana daty wa¿no¶ci podklucza.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa¿no¶ci g³ównego klucza.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1575
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nie mo¿na zmieniæ daty wa¿no¶ci klucza w wersji 3.\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1591
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj±cego podpisu w zbiorze kluczy tajnych\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1652
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u¿ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1698
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Brak podklucza o indeksie %d\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1796
 msgid "user ID: \""
 msgstr "Identyfikator u¿ytkownika: "
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1799
 #, c-format
 msgid ""
 "\"\n"
@@ -2540,125 +2562,116 @@
 "\"\n"
 "podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1803
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Stworzyæ certyfikat uniewa¿nienia tego podpisu? (t/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1827
 msgid "You have signed these user IDs:\n"
-msgstr "Te identyfikatory s± podpisane przez ciebie:\n"
+msgstr "Te identyfikatory u¿ytkowników s± podpisane przez Ciebie:\n"
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
 #, c-format
 msgid "   signed by %08lX at %s\n"
-msgstr "   podpisany kluczem %08lX w %s\n"
+msgstr "podpisany przez %08lX w %s\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1846
 #, c-format
 msgid "   revoked by %08lX at %s\n"
-msgstr "uniewa¿niony kluczem %08lX w %s\n"
+msgstr "uniewa¿niony przez %08lX w %s\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1866
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa¿niæ te podpisy:\n"
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1884
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Na pewno utworzyæ certyfikaty uniewa¿nienia ? (t/N)"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1913
 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:400 g10/mainproc.c:790
-#, fuzzy, c-format
+#: g10/keylist.c:279 g10/mainproc.c:851
+#, c-format
 msgid " [expires: %s]"
-msgstr "Data wa¿no¶ci klucza: %s\n"
+msgstr "[wygasa :%s]"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:269
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "klucz publiczny %08lX\n"
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:314
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:366
 #, 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:336
+#: g10/mainproc.c:376
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "zaszyfrowane kluczem %s, o identyfikatorze %08lX\n"
 
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr "odszyfrowuj±cy klucz tajny do jest niedostêpny\n"
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:390
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "b³±d odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:430
 msgid "decryption okay\n"
 msgstr "odszyfrowane poprawnie\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:435
 msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr "OSTRZE¯ENIE: dokonano manipulacji zaszyfrowan± wiadomo¶ci±!\n"
+msgstr "OSTRZE¯ENIE: zaszyfrowana wiadomo¶æ by³a manipulowana!\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:440
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b³±d odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:459
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
-msgstr "UWAGA: nadawca zaznaczy³ ¿e wiadomo¶æ nie powinna byæ zapisywana!\n"
+msgstr "UWAGA: nadawca zaznaczy³ ¿e wiadomo¶æ nie powinna byæ zapisywana\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:461
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:632
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
-"oddzielony certyfikat uniewa¿nienia - wywo³aj \"gpg --import\" aby go u¿yæ\n"
+"osobny certyfikat uniewa¿nienia - u¿yj \"gpg --import\" aby go przyj±æ\n"
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:719 g10/mainproc.c:728
 msgid "WARNING: invalid notation data found\n"
 msgstr "OSTRZE¯ENIE: niepoprawne dane w adnotacji\n"
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:731
 msgid "Notation: "
-msgstr "Adnotacja: "
+msgstr "Adnotacja:"
 
-#: g10/mainproc.c:680
+#: g10/mainproc.c:740
 msgid "Policy: "
-msgstr "Regulamin: "
+msgstr "Regulamin:"
 
-#: g10/mainproc.c:1121
+#: g10/mainproc.c:1193
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pominiêcie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:1158
+#. plaintext before signatures but no one-pass packets
+#: g10/mainproc.c:1235 g10/mainproc.c:1245
+msgid "can't handle these multiple signatures\n"
+msgstr "nie mo¿na obs³uzyæ tych wielokrotnych podpisów\n"
+
+#: g10/mainproc.c:1256
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
@@ -2666,62 +2679,120 @@
 "z u¿yciem klucza o identyfikatorze %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1184 g10/mainproc.c:1195
+#: g10/mainproc.c:1284 g10/mainproc.c:1292
 msgid "BAD signature from \""
 msgstr "NIEPOPRAWNY podpis z³o¿ony przez \""
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1196
+#: g10/mainproc.c:1285 g10/mainproc.c:1293
 msgid "Good signature from \""
 msgstr "Poprawny podpis z³o¿ony przez \""
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1243
+#: g10/mainproc.c:1358
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mo¿na sprawdziæ podpisu: %s\n"
 
-#: g10/mainproc.c:1318
+#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+msgid "not a detached signature\n"
+msgstr "nie jest oddzielonym podpisem\n"
+
+#: g10/mainproc.c:1454
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x\n"
 
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1511
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1518
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, 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:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Nie nale¿y u¿ywaæ algorytmów do¶wiadczalnych!\n"
 
-#: g10/misc.c:234
-msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
+#: g10/misc.c:238
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
-"ten algorytm szyfruj±cy jest odradzany; proszê u¿ywaæ bardziej "
+"odradza siê stosowanie tego algorytmu; proszê u¿ywaæ bardziej "
 "standardowych!\n"
 
 #: g10/parse-packet.c:119
 #, c-format
 msgid "can't handle public key algorithm %d\n"
-msgstr "algorytm klucza publicznego niemo¿liwy do obs³u¿enia: %d\n"
+msgstr "nie mo¿na obs³u¿yæ tego algorytmu klucza publicznego: %d\n"
 
-#: g10/parse-packet.c:991
+#: g10/parse-packet.c:1010
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
 
-#: g10/passphrase.c:159
+#: g10/passphrase.c:223
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent nie jest dostêpny w tej sesji\n"
+
+#: g10/passphrase.c:229
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "z³y format zmiennej GPG_AGENT_INFO\n"
+
+#: g10/hkp.c:167 g10/passphrase.c:248
+#, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "nie mo¿na po³±czyæ siê z %s: %s\n"
+
+#: g10/passphrase.c:313 g10/passphrase.c:576
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr " (g³ówny ID klucza %08lX)"
+
+#: g10/passphrase.c:323
+#, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"Musisz podaæ wyra¿enie przej¶ciowe (has³o) aby uaktywniæ klucz tajny\n"
+"dla u¿ytkownika: \"%.*s\"\n"
+"Klucz o d³ugo¶ci %u bitów, typ %s, ID %08lX, stworzony %s%s\n"
+
+#: g10/passphrase.c:344
+msgid "Enter passphrase\n"
+msgstr "Wyra¿enie przej¶ciowe\n"
+
+#: g10/passphrase.c:346
+msgid "Repeat passphrase\n"
+msgstr "Powtórzone wyra¿enie przej¶ciowe\n"
+
+#: g10/passphrase.c:384
+msgid "passphrase too long\n"
+msgstr "wyra¿enie zbyt d³ugie\n"
+
+#: g10/passphrase.c:396
+msgid "invalid response from agent\n"
+msgstr "b³êdna odpowied¼ agenta\n"
+
+#: g10/passphrase.c:405
+msgid "cancelled by user\n"
+msgstr "anulowane przez u¿ytkownika\n"
+
+#: g10/passphrase.c:408 g10/passphrase.c:477
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr "problem agenta: zwróci³ 0x%lx\n"
+
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2731,48 +2802,45 @@
 "Musisz podaæ wyra¿enie przej¶ciowe (has³o) aby uaktywniæ klucz tajny\n"
 "dla u¿ytkownika: \""
 
-#: g10/passphrase.c:168
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "d³ugo¶æ %u bitów, typ %s, klucz %08lX, stworzony %s"
 
-#: g10/passphrase.c:173
-#, c-format
-msgid " (main key ID %08lX)"
-msgstr ""
-" \n"
-"(identyfikator g³ównego klucza %08lX)"
-
-#: g10/passphrase.c:190
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
 msgstr "pytanie o has³o nie dzia³a w trybie wsadowym\n"
 
-#: g10/passphrase.c:194
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr "Wyra¿enie przej¶ciowe: "
 
-#: g10/passphrase.c:198
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr "Powtórzone wyra¿enie przej¶ciowe: "
 
 #: 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"
+"dane nie zosta³y zapisane; aby to zrobiæ, nale¿y u¿yæ opcji \"--output\"\n"
 
-#: g10/plaintext.c:324
+#: g10/plaintext.c:332
 msgid "Detached signature.\n"
-msgstr "Podpis oddzielony.\n"
+msgstr "Podpis oddzielony od danych.\n"
 
-#: g10/plaintext.c:328
+#: g10/plaintext.c:336
 msgid "Please enter name of data file: "
 msgstr "Nazwa pliku danych: "
 
-#: g10/plaintext.c:349
+#: g10/plaintext.c:357
 msgid "reading stdin ...\n"
-msgstr "odczyt ze strumienia standardowego wej¶cia...\n"
+msgstr "czytam strumieñ standardowego wej¶cia\n"
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:391
+msgid "no signed data\n"
+msgstr "brak podpisanych danych\n"
+
+#: g10/plaintext.c:399
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nie mo¿na otworzyæ podpisanego pliku '%s'\n"
@@ -2780,7 +2848,7 @@
 #: g10/pubkey-enc.c:76
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
-msgstr "adresat anonimowy; próba klucza tajnego %08lX ...\n"
+msgstr "adresat anonimowy; próbujê klucz tajny %08lX ...\n"
 
 #: g10/pubkey-enc.c:82
 msgid "okay, we are the anonymous recipient.\n"
@@ -2791,9 +2859,9 @@
 msgstr "stary, nie obs³ugiwany algorytm szyfrowania klucza sesyjnego\n"
 
 #: g10/pubkey-enc.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
-msgstr "%d - algorytm ochrony nie obs³ugiwany\n"
+msgstr "algorytm szyfruj±cy %d jest nieznany, b±d¼ zosta³ wy³±czony\n"
 
 #: g10/pubkey-enc.c:192
 #, c-format
@@ -2801,58 +2869,52 @@
 msgstr "UWAGA: brak algorytmu szyfruj±cego %d w ustawieniach\n"
 
 #: g10/pubkey-enc.c:198
-#, fuzzy, c-format
+#, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
-msgstr "UWAGA: klucz podpisuj±cy przekroczy³ datê wa¿no¶ci %s\n"
+msgstr "UWAGA: wa¿no¶æ klucza tajnego %08lX wygas³a %s\n"
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
-msgstr ""
+msgstr "zapytanie o klucz %08lX w %s ...\n"
 
-#: g10/hkp.c:85
-#, fuzzy, c-format
+#: g10/hkp.c:83
+#, c-format
 msgid "can't get key from keyserver: %s\n"
-msgstr "niemo¿liwy jest zapis do zbioru kluczy: %s\n"
+msgstr "nie mo¿na pobraæ klucza z serwera: %s\n"
 
-#: g10/hkp.c:109 g10/hkp.c:148
+#: g10/hkp.c:102 g10/hkp.c:136
 msgid "no keyserver known (use option --keyserver)\n"
-msgstr ""
+msgstr "brak znanyk serwerów kluczy (u¿yj opcji --keyserver)\n"
 
-#: g10/hkp.c:117
-#, fuzzy, c-format
+#: g10/hkp.c:110
+#, c-format
 msgid "%s: not a valid key ID\n"
-msgstr "'%s\" nie jest w³a¶ciwym identyfikatorem klucza\n"
-
-#: g10/hkp.c:170
-#, fuzzy, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "nie mo¿na otworzyæ %s: %s\n"
+msgstr "%s: nie jest poprawnym identyfikatorem klucza\n"
 
-#: g10/hkp.c:194
-#, fuzzy, c-format
+#: g10/hkp.c:191
+#, c-format
 msgid "error sending to `%s': %s\n"
-msgstr "b³±d odczytu '%s': %s\n"
+msgstr "b³±d przy wysy³aniu do '%s': %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:203
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
-msgstr ""
+msgstr "wysy³anie do '%s' powiod³o siê (status=%u)\n"
 
-#: g10/hkp.c:209
+#: g10/hkp.c:206
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
-msgstr ""
+msgstr "wysy³anie do '%s' nie powiod³o siê (status=%u)\n"
 
 #: g10/seckey-cert.c:53
-#, fuzzy
 msgid "secret key parts are not available\n"
-msgstr "klucz tajny nie jest dostêpny"
+msgstr "tajne czê¶ci klucza s± niedostêpne\n"
 
 #: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d is not supported\n"
-msgstr "%d - algorytm ochrony nie obs³ugiwany\n"
+msgstr "algorytm ochrony %d nie jest obs³ugiwany\n"
 
 #: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
@@ -2887,31 +2949,36 @@
 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:324
+#: g10/sig-check.c:328
 #, c-format
-msgid "NOTE: signature key expired %s\n"
-msgstr "UWAGA: klucz podpisuj±cy przekroczy³ datê wa¿no¶ci %s\n"
+msgid "NOTE: signature key %08lX expired %s\n"
+msgstr "UWAGA: klucz podpisuj±cy %08lX przekroczy³ datê wa¿no¶ci %s\n"
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
-"przyjêto niewa¿no¶æ podpisu z powodu ustawienia nieznanego bitu krytycznego\n"
+"przyjêto niewa¿no¶æ podpisu z powonu ustawienia nieznanego bitu krytycznego\n"
 
-#: g10/sign.c:140
+#: g10/sign.c:152
+#, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "sprawdzenie z³o¿onego podpisu nie powiod³o siê: %s\n"
+
+#: g10/sign.c:161
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s podpis z³o¿ony przez: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:307 g10/sign.c:630
 #, c-format
 msgid "can't create %s: %s\n"
-msgstr "nie mo¿na stworzyæ %s: %s\n"
+msgstr "nie mo¿na utworzyæ %s: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:405
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:431
+#: g10/sign.c:448
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "OSTRZE¯ENIE: plik '%s' jest pusty\n"
@@ -2950,7 +3017,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalog nie istnieje!\n"
 
-#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
+#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: nie mo¿na utworzyæ: %s\n"
@@ -2963,12 +3030,12 @@
 #: g10/tdbio.c:473
 #, c-format
 msgid "%s: failed to create version record: %s"
-msgstr "%s: utworzenie zapisu o wersji nie powiod³o siê: %s"
+msgstr "%s: stworzenie zapisu o wersji nie powiod³o siê: %s"
 
 #: g10/tdbio.c:477
 #, c-format
 msgid "%s: invalid trustdb created\n"
-msgstr "%s: utworzono niepoprawny plik bazy zaufania\n"
+msgstr "%s: stworzony niepoprawny plik bazy zaufania\n"
 
 #: g10/tdbio.c:480
 #, c-format
@@ -3014,7 +3081,7 @@
 #: g10/tdbio.c:1264
 #, c-format
 msgid "%s: not a trustdb file\n"
-msgstr "%s: nie jest plikiem bazy zaufania\n"
+msgstr "%s: to nie jest plik bazy zaufania\n"
 
 #: g10/tdbio.c:1280
 #, c-format
@@ -3029,7 +3096,7 @@
 #: g10/tdbio.c:1589
 #, c-format
 msgid "%s: error reading free record: %s\n"
-msgstr "%s: b³±d odczytu wolnego wpisu: %s\n"
+msgstr "%s: b³±d odczytu pustego wpisu: %s\n"
 
 #: g10/tdbio.c:1597
 #, c-format
@@ -3049,7 +3116,7 @@
 #: g10/tdbio.c:1748
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
-"Baza zaufania jest uszkodzona; proszê uruchomiæ \"gpgm --fix-trust-db\".\n"
+"Baza zaufania jest uszkodzona; proszê uruchomiæ \"gpg --fix-trustdb\".\n"
 
 #: g10/trustdb.c:169
 #, c-format
@@ -3097,9 +3164,9 @@
 msgstr "get_dir_record: funkcja search_record zawiod³a: %s\n"
 
 #: g10/trustdb.c:474
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid long keyID\n"
-msgstr "'%s\" nie jest w³a¶ciwym identyfikatorem klucza\n"
+msgstr "'%s' nie jest w³a¶ciwym identyfikatorem klucza\n"
 
 #: g10/trustdb.c:501
 #, c-format
@@ -3125,18 +3192,13 @@
 #, 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"
+"klucz %08lX: brak klucza publicznego dla zaufanego klucza - 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"
@@ -3272,7 +3334,7 @@
 #: g10/trustdb.c:1873
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
-msgstr "\t%lu z powodu nowych kluczy publicznych\n"
+msgstr "        %lu z powodu nowych podkluczy\n"
 
 #: g10/trustdb.c:1875
 #, c-format
@@ -3342,67 +3404,76 @@
 #: 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"
+msgstr "umieszczenie '%s' w Bazie Zaufania nie powiod³o siê: %s\n"
 
 #: 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"
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
-"podpis niemo¿liwy do sprawdzenia.\n"
-"Nale¿y pamiêtaæ aby plik zawieraj±cy podpis (.sig lub .asc)<\n"
-"by³ pierwszym plikiem podanym w linii poleceñ.\n"
+"nie mo¿na sprawdziæ podpisu.\n"
+"Nale¿y pamiêtaæ o podawaniu pliku podpisu (.sig lub .asc) jako pierwszego\n"
+"argumentu linii poleceñ.\n"
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
-msgstr "linia wej¶ciowa %u jest zbyt d³uga lub brakuje jej zakoñczenia\n"
+msgstr "linia wej¶cia %u zbyt d³uga lub brak znaku LF\n"
 
 #: g10/ringedit.c:302
 #, c-format
 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:1374
+#: g10/ringedit.c:319 g10/ringedit.c:1376
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: zbiór kluczy utworzony\n"
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1557
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "OSTRZE¯ENIE: Istniej± dwa pliki z poufnymi informacjami.\n"
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1558
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s pozosta³ bez zmian\n"
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1559
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s zosta³ utworzony\n"
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1560
 msgid "Please fix this possible security flaw\n"
-msgstr "Proszê usun±æ to naruszenie zasad bezpieczeñstwa.\n"
+msgstr "Proszê usun±æ to naruszenie zasad bezpieczeñstwa\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
-"klucz nie jest oznaczony jako niepewny - nie mo¿na go u¿yæ z atrap±\n"
+"klucz nie jest oznaczony jako niepewny - nie mo¿na go u¿yæ z atrap± \n"
 "generatora liczb losowych!\n"
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "pominiêty '%s': duplikat\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "pominiêty '%s': %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+msgid "skipped: secret key already present\n"
+msgstr "pominiêty: klucz tajny ju¿ znajduje siê w bazie\n"
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3430,33 +3501,33 @@
 msgid "Enter new filename"
 msgstr "Nazwa pliku"
 
-#: g10/openfile.c:182
+#: g10/openfile.c:184
 msgid "writing to stdout\n"
 msgstr "zapisywanie na wyj¶cie standardowe\n"
 
-#: g10/openfile.c:261
+#: g10/openfile.c:273
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "przyjêto obecno¶æ podpisanych danych w '%s'\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:323
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: stworzono nowy plik ustawieñ\n"
 
-#: g10/openfile.c:338
+#: g10/openfile.c:350
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: nie mo¿na utworzyæ katalogu: %s\n"
 
-#: g10/openfile.c:341
+#: g10/openfile.c:353
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: katalog utworzony\n"
 
-#: g10/openfile.c:343
+#: g10/openfile.c:355
 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"
+msgstr "aby u¿yæ nowego pliku ustawieñ, nale¿y od nowa uruchomiæ GnuPG\n"
 
 #: g10/encr-data.c:66
 #, c-format
@@ -3474,6 +3545,10 @@
 msgstr ""
 "OSTRZE¯ENIE: wiadomo¶æ by³a szyfrowana s³abym kluczem szyfru symetrycznego.\n"
 
+#: g10/encr-data.c:97
+msgid "problem handling encrypted packet\n"
+msgstr "problem podczas obróbki pakietu szyfrowego\n"
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "wygenerowano s³aby klucz - operacja zostaje powtórzona\n"
@@ -3485,17 +3560,9 @@
 "brak mo¿liwo¶ci generacji dobrego klucza dla szyfru symetrycznego;\n"
 "operacja by³a powtarzana %d razy!\n"
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "dla tego klucza publicznego istnieje klucz tajny!\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr "nale¿y najpierw go usun±æ opcj± \"--delete-secret-key\".\n"
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
-msgstr "nie dzia³a w trybie wsadowym bez opcji \"--yes\"\n"
+msgstr "bez opcji \"--yes\" nie dzia³a w trybie wsadowym\n"
 
 #: g10/delkey.c:136
 msgid "Delete this key from the keyring? "
@@ -3503,7 +3570,15 @@
 
 #: g10/delkey.c:144
 msgid "This is a secret key! - really delete? "
-msgstr "To jest klucz tajny - czy na pewno go usun±æ? "
+msgstr "To jest klucz tajny! - czy na pewno go usun±æ? "
+
+#: g10/delkey.c:181
+msgid "there is a secret key for this public key!\n"
+msgstr "jest klucz tajny do tego klucza publicznego!\n"
+
+#: g10/delkey.c:183
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr "aby go usun±æ nalezy najpierw u¿yæ opcji \"--delete-secret-key\".\n"
 
 #: g10/helptext.c:47
 msgid ""
@@ -3554,22 +3629,22 @@
 msgstr ""
 "Wybór algorytmu.\n"
 "\n"
-"DSA (zwany te¿ DSS) to algorytm podpisu cyfrowego, i tylko do sk³adania\n"
-"podpisów mo¿e on byæ u¿ywany. Jest to preferowany algorytm poniewa¿ "
-"sk³adane\n"
-"nim podpisy sprawdza siê du¿o szybciej ni¿ te sk³adane algorytmem ElGamala.\n"
-"\n"
-"Algorytm ElGamala mo¿e byæ u¿ywany zarówno do podpisów jak i do "
-"szyfrowania.\n"
-"Standard OpenPGP rozró¿nia dwa typy tego algorytmu - tylko do szyfrowania,\n"
-"oraz do szyfrowania i podpisywania. Faktycznie algorytm pozostaje bez zmian\n"
-"ale pewne parametry musz± byæ odpowiednio dobrane aby stworzyæ klucz którym\n"
-"mo¿na sk³adaæ bezpieczne podpisy. Ten program obs³uguje oba typy ale inne\n"
-"implementacje nie musz± rozumieæ kluczy do podpisów i szyfrowania\n"
-"\n"
-"G³ówny klucz musi byæ kluczem podpisuj±cym, jest to powodem dla którego w "
-"tym\n"
-"menu nie ma mo¿no¶ci wyboru klucza ElGamala do szyfrowania."
+"DSA (zwany te¿ DSS) to algorytm podpisu cyfrowego i tylko do sk³adania\n"
+"podpisów mo¿e byæ u¿ywany. Jest to preferowany algorytm poniewa¿\n"
+"sk³adane nim podpisy sprawdza siê du¿o szybciej ni¿ te sk³adane\n"
+"algorytmem ElGamala.\n"
+"\n"
+"Algorytm ElGamala mo¿e byæ u¿ywany zarówno do podpisów jak i do\n"
+"szyfrowania.  Standard OpenPGP rozró¿nia dwa typy tego algorytmu -\n"
+"tylko do szyfrowania, oraz do szyfrowania i podpisywania. Faktycznie\n"
+"algorytm pozostaje bez zmian ale pewne parametry musz± byæ odpowiednio\n"
+"dobrane aby stworzyæ klucz którym mo¿na sk³adaæ bezpieczne\n"
+"podpisy. Ten program obs³uguje oba typy ale inne implementacje nnie\n"
+"musz± rozumieæ kluczy do podpisów i szyfrowania\n"
+"\n"
+"G³ówny klucz musi byæ kluczem podpisuj±cym, jest to powodem dla\n"
+"którego w tym menu nie ma mo¿no¶ci wyboru klucza ElGamala do\n"
+"szyfrowania."
 
 #: g10/helptext.c:85
 msgid ""
@@ -3577,10 +3652,9 @@
 "because they are not supported by all programs and signatures created\n"
 "with them are quite large and very slow to verify."
 msgstr ""
-"Ten typ klucza jest zdefiniowany w RFC2440, jednak¿e jest on odradzany gdy¿\n"
-"nie jest obs³ugiwany przez wszystkie programy, a podpisy nim sk³adane s± "
-"du¿e\n"
-"i ich sprawdzanie trwa d³ugo."
+"Ten typ klucza jest zdefiniowany w RFC2440, jednak¿e jest on odradzany\n"
+"gdy¿ nie jest obs³ugiwany przez wszystkie programy, a podpisy nim\n"
+"sk³adane s± du¿e i ich sprawdzanie trwa d³ugo."
 
 #: g10/helptext.c:92
 msgid "Enter the size of the key"
@@ -3589,7 +3663,7 @@
 #: g10/helptext.c:96 g10/helptext.c:101 g10/helptext.c:113 g10/helptext.c:145
 #: g10/helptext.c:150 g10/helptext.c:155 g10/helptext.c:160
 msgid "Answer \"yes\" or \"no\""
-msgstr "Odpowiedz \"tak\" lub \"nie\"."
+msgstr "Odpowied¼ \"tak\" lub \"nie\"."
 
 #: g10/helptext.c:106
 msgid ""
@@ -3598,9 +3672,10 @@
 "get a good error response - instead the system tries to interpret\n"
 "the given value as an interval."
 msgstr ""
-"Wprowad¼ ¿±dan± warto¶æ (jak w znaku zachêty). Mo¿na tu podaæ datê w\n"
-"formacie ISO (RRRR-MM-DD) ale nie da to w³a¶ciwej obs³ugi b³êdów - system\n"
-"próbuje interpretowaæ podan± warto¶æ jako okres."
+"Wprowad¼ ¿±dan± warto¶æ (jak w znaku zachêty).  \n"
+"Mo¿na tu podaæ datê w formacie ISO (RRRR-MM-DD) ale nie da to\n"
+"w³a¶ciwej obs³ugi b³êdów - system próbuje interpretowaæ podan± warto¶æ\n"
+"jako okres."
 
 #: g10/helptext.c:118
 msgid "Enter the name of the key holder"
@@ -3668,17 +3743,17 @@
 "know which key was used because this signing key might establish\n"
 "a trust connection through another already certified key."
 msgstr ""
-"Ten podpis nie mo¿e zostaæ potwierdzony poniewa¿ nie masz\n"
+"Ten podpis nie mo¿e zostaæ potwierdzony poniewa¿ nie ma\n"
 "odpowiadaj±cego mu klucza publicznego. Nale¿y od³o¿yæ usuniêcie tego\n"
-"podpisu do czasu, kiedy oka¿e siê który klucz zosta³ u¿yty, poniewa¿ w\n"
-"momencie uzyskania tego klucza mo¿e pojawiæ siê ¶cie¿ka zaufania\n"
+"podpisu do czasu, kiedy oka¿e siê który klucz zosta³ u¿yty, poniewa¿\n"
+"w momencie uzyskania tego klucza mo¿e pojawiæ siê ¶cie¿ka zaufania\n"
 "pomiêdzy tym a innym, ju¿ po¶wiadczonym kluczem."
 
 #: g10/helptext.c:189
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
-msgstr "Ten podpis jest niepoprawny. Ma sens usuniêcie go z bazy kluczy."
+msgstr "Ten podpis jest niepoprawny. Mo¿na usuni±æ go z bazy kluczy."
 
 #: g10/helptext.c:193
 msgid ""
@@ -3709,7 +3784,7 @@
 
 #: g10/helptext.c:213
 msgid "Give the name of the file to which the signature applies"
-msgstr "Nazwa pliku którego dotyczy podpis"
+msgstr "Podaj nazwê pliku którego dotyczy ten podpis"
 
 #: g10/helptext.c:218
 msgid "Answer \"yes\" if it is okay to overwrite the file"
@@ -3737,6 +3812,17 @@
 "      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"
 msgstr ""
+"Nalezy podaæ powód uniewa¿nienia klucza. W zale¿no¶ci od kontekstu mo¿na\n"
+"go wybraæ z listy:\n"
+"  \"Klucz zosta³ skompromitowany\"\n"
+"      Masz powody uwa¿aæ ¿e twój klucz tajny dosta³ siê w niepowo³ane rêce.\n"
+"  \"Klucz zosta³ zast±piony\"\n"
+"      Klucz zosta³ zast±piony nowym.\n"
+"  \"Klucz nie jest ju¿ u¿ywany\"\n"
+"      Klucz zosta³ wycofany z u¿ycia.\n"
+"  \"Identyfikator u¿ytkownika przesta³ byæ poprawny\"\n"
+"      Identyfikator u¿ytkownika (najczê¶ciej adres e-mail przesta³ byæ \n"
+"      poprawny.\n"
 
 #: g10/helptext.c:245
 msgid ""
@@ -3744,6 +3830,9 @@
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
+"Je¶li chcesz, mo¿esz podaæ opis powodu wystawienia certyfikatu\n"
+"uniewa¿nienia. Opis powinien byc zwiêz³y. \n"
+"Pusta linia koñczy wprowadzanie tekstu.\n"
 
 #: g10/helptext.c:260
 msgid "No help available"
@@ -3754,18 +3843,29 @@
 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 "RSA key cannot be used in this version\n"
+#~ msgstr "W tej wersji nie mo¿na u¿ywaæ kluczy RSA\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Brak klucza z takim identyfikatorem u¿ytkownika.\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Brak identyfikatora u¿ytkownika dla klucza.\n"
+
+#~ msgid "invalid"
+#~ msgstr "niepoprawny"
+
+#~ msgid "revoked"
+#~ msgstr "uniewa¿niony"
+
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "odszyfrowuj±cy klucz tajny do jest niedostêpny\n"
 
 #~ msgid "set debugging flags"
 #~ msgstr "ustawienie opcji ¶ledzenia wykonania programu"
 
 #~ msgid "enable full debugging"
-#~ msgstr "w³±czenie pe³nego ¶ledzenia programu"
+#~ msgstr "umo¿liwienie pe³nego ¶ledzenia programu"
 
 #~ msgid "do not write comment packets"
 #~ msgstr "nie zapisywaæ pakietów z komentarzem"
@@ -3783,6 +3883,14 @@
 #~ msgid "Key generation can only be used in interactive mode\n"
 #~ msgstr "Generacjê klucza mo¿na wykonywaæ tylko w trybie interaktywnym\n"
 
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "Odradza siê stosowanie kluczy RSA; proszê rozwa¿yæ przej¶cie na inne "
+#~ "algorytmy\n"
+#~ "po wygenerowaniu odpowiednich kluczy.\n"
+
 #~ msgid "print all message digests"
 #~ msgstr "wszystkie skróty wiadomo¶ci"
 
@@ -4054,9 +4162,6 @@
 #~ msgid "lid %lu: read pref record failed: %s\n"
 #~ msgstr "lid %lu: odczyt wpisu ustawieñ nie powiód³ siê: %s\n"
 
-#~ msgid "lid %lu: read sig record failed: %s\n"
-#~ msgstr "lid %lu: odczyt wpisu o podpisach nie powiód³ siê: %s\n"
-
 #~ msgid "user '%s' read problem: %s\n"
 #~ msgstr "u¿ytkownik '%s' b³±d przy odczycie: %s\n"
 
@@ -4075,9 +4180,6 @@
 
 #~ msgid "directory record w/o primary key\n"
 #~ msgstr "wpis katalogowy bez klucza g³ównego\n"
-
-#~ msgid "line too long\n"
-#~ msgstr "linia za d³uga\n"
 
 #~ msgid "error: missing colon\n"
 #~ msgstr "b³±d: brak dwukropka\n"
diff -urN gnupg-1.0.4/po/pt_BR.po gnupg-1.0.5/po/pt_BR.po
--- gnupg-1.0.4/po/pt_BR.po	Tue Oct 17 15:40:40 2000
+++ gnupg-1.0.5/po/pt_BR.po	Sun Apr 29 16:39:29 2001
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-10-16 19:22+0200\n"
+"POT-Creation-Date: 2001-04-29 16:39+0200\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-20 23:46:36-0200\n"
 "From: Thiago Jung Bauermann <jungmann@usa.net>\n"
@@ -21,36 +21,36 @@
 msgid "Warning: using insecure memory!\n"
 msgstr "Aviso: usando memória insegura!\n"
 
-#: util/secmem.c:295
+#: util/secmem.c:299
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "a operação não é possível sem memória segura inicializada\n"
 
-#: util/secmem.c:296
+#: util/secmem.c:300
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(você pode ter usado o programa errado para esta tarefa)\n"
 
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:287 util/miscutil.c:316
 msgid "yes"
 msgstr "sim"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:288 util/miscutil.c:319
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:289 util/miscutil.c:317
 msgid "no"
 msgstr "não"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:290 util/miscutil.c:320
 msgid "nN"
 msgstr "nN"
 
 # INICIO MENU
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:318
 msgid "quit"
 msgstr "sair"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:321
 msgid "qQ"
 msgstr "qQ"
 
@@ -251,6 +251,17 @@
 msgid "not processed"
 msgstr "não processado(s)"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "chave pública incorreta"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "chave secreta incorreta"
+
 #: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -261,63 +272,63 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "você encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:324
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:329
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:325
+#: cipher/random.c:334
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:331
+#: cipher/random.c:340
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:339
+#: cipher/random.c:348
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:386
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:397
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossível criar %s: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:413
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:416
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:427
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:650
+#: cipher/random.c:661
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: usando gerador de números aleatórios inseguro!\n"
 
-#: cipher/random.c:651
+#: cipher/random.c:662
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -343,7 +354,7 @@
 "para que o sistema possa coletar mais entropia!\n"
 "(São necessários mais %d bytes)\n"
 
-#: g10/g10.c:206
+#: g10/g10.c:216
 msgid ""
 "@Commands:\n"
 " "
@@ -351,144 +362,144 @@
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:208
+#: g10/g10.c:218
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/g10.c:209
+#: g10/g10.c:219
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:210
+#: g10/g10.c:220
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:211
+#: g10/g10.c:221
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/g10.c:212
+#: g10/g10.c:222
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "simétrica"
 
-#: g10/g10.c:213
+#: g10/g10.c:223
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:214
+#: g10/g10.c:224
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padrão)"
 
-#: g10/g10.c:215
+#: g10/g10.c:225
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:217
+#: g10/g10.c:227
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:219
+#: g10/g10.c:229
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:220
+#: g10/g10.c:230
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:221
+#: g10/g10.c:231
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impressões digitais"
 
-#: g10/g10.c:222
+#: g10/g10.c:232
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:223
+#: g10/g10.c:233
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:224
+#: g10/g10.c:234
 msgid "remove key from the public keyring"
 msgstr "remover a chave do chaveiro público"
 
-#: g10/g10.c:226
+#: g10/g10.c:236
 msgid "remove key from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/g10.c:227
+#: g10/g10.c:237
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:228
+#: g10/g10.c:238
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:229
+#: g10/g10.c:239
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:230
+#: g10/g10.c:240
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revogação"
 
-#: g10/g10.c:231
+#: g10/g10.c:241
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:232
+#: g10/g10.c:242
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:233
+#: g10/g10.c:243
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:237
+#: g10/g10.c:247
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:239
+#: g10/g10.c:249
 msgid "list only the sequence of packets"
 msgstr "listar apenas as seqüências de pacotes"
 
 # ownertrust ???
-#: g10/g10.c:241
+#: g10/g10.c:251
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confiança"
 
-#: g10/g10.c:243
+#: g10/g10.c:253
 msgid "import ownertrust values"
 msgstr "importar os valores de confiança"
 
-#: g10/g10.c:245
+#: g10/g10.c:255
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/g10.c:247
+#: g10/g10.c:257
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMES]|verificar o banco de dados de confiabilidade"
 
-#: g10/g10.c:248
+#: g10/g10.c:258
 msgid "fix a corrupted trust database"
 msgstr ""
 "consertar um banco de dados de confiabilidade\n"
 "danificado"
 
-#: g10/g10.c:249
+#: g10/g10.c:259
 msgid "De-Armor a file or stdin"
 msgstr "retirar a armadura de um arquivo ou de \"stdin\""
 
-#: g10/g10.c:251
+#: g10/g10.c:261
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um arquivo ou \"stdin\""
 
-#: g10/g10.c:253
+#: g10/g10.c:263
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:257
+#: g10/g10.c:267
 msgid ""
 "@\n"
 "Options:\n"
@@ -498,175 +509,179 @@
 "Opções:\n"
 " "
 
-#: g10/g10.c:259
+#: g10/g10.c:269
 msgid "create ascii armored output"
 msgstr "criar saída com armadura ascii"
 
-#: g10/g10.c:261
+#: g10/g10.c:271
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/g10.c:264
+#: g10/g10.c:274
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinatário padrão"
 
-#: g10/g10.c:266
+#: g10/g10.c:276
 msgid "use the default key as default recipient"
 msgstr "usar a chave padrão como destinatário padrão"
 
-#: g10/g10.c:270
+#: g10/g10.c:280
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usuário para\n"
 "assinar ou descriptografar"
 
-#: g10/g10.c:271
+#: g10/g10.c:281
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer nível de compressão N\n"
 "(0 desabilita)"
 
-#: g10/g10.c:273
+#: g10/g10.c:283
 msgid "use canonical text mode"
 msgstr "usar modo de texto canônico"
 
-#: g10/g10.c:274
+#: g10/g10.c:284
 msgid "use as output file"
 msgstr "usar como arquivo de saída"
 
-#: g10/g10.c:275
+#: g10/g10.c:285
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:276
+#: g10/g10.c:286
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:277
+#: g10/g10.c:287
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:278
+#: g10/g10.c:288
 msgid "force v3 signatures"
 msgstr "forçar assinaturas v3"
 
-#: g10/g10.c:279
+#: g10/g10.c:289
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: g10/g10.c:280
+#: g10/g10.c:290
 msgid "do not make any changes"
 msgstr "não fazer alterações"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:282
+#: g10/g10.c:292
+msgid "use the gpg-agent"
+msgstr ""
+
+#: g10/g10.c:293
 msgid "batch mode: never ask"
 msgstr "modo não-interativo: nunca perguntar"
 
-#: g10/g10.c:283
+#: g10/g10.c:294
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:284
+#: g10/g10.c:295
 msgid "assume no on most questions"
 msgstr "assumir não para a maioria das perguntas"
 
-#: g10/g10.c:285
+#: g10/g10.c:296
 msgid "add this keyring to the list of keyrings"
 msgstr "adicionar este chaveiro à lista de chaveiros"
 
-#: g10/g10.c:286
+#: g10/g10.c:297
 msgid "add this secret keyring to the list"
 msgstr "adicionar este chaveiro secreto à lista"
 
-#: g10/g10.c:287
+#: g10/g10.c:298
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta padrão"
 
-#: g10/g10.c:288
+#: g10/g10.c:299
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDEREÇO|usar este servidor para buscar chaves"
 
-#: g10/g10.c:289
+#: g10/g10.c:300
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:290
+#: g10/g10.c:301
 msgid "read options from file"
 msgstr "ler opções do arquivo"
 
-#: g10/g10.c:294
+#: g10/g10.c:305
 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:299
+#: g10/g10.c:310
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:300
+#: g10/g10.c:311
 msgid "|FILE|load extension module FILE"
 msgstr "|ARQUIVO|carregar módulo de extensão ARQUIVO"
 
-#: g10/g10.c:301
+#: g10/g10.c:312
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:302
+#: g10/g10.c:313
 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:303
+#: g10/g10.c:314
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar frase secreta modo N"
 
-#: g10/g10.c:305
+#: g10/g10.c:316
 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:307
+#: g10/g10.c:318
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:308
+#: g10/g10.c:319
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:309
+#: g10/g10.c:320
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:310
+#: g10/g10.c:321
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compressão N"
 
-#: g10/g10.c:311
+#: g10/g10.c:322
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "eliminar o campo keyid dos pacotes\n"
 "criptografados"
 
-#: g10/g10.c:312
+#: g10/g10.c:323
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes dados de notação"
 
-#: g10/g10.c:315
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:318
+#: g10/g10.c:329
 msgid ""
 "@\n"
 "Examples:\n"
@@ -686,15 +701,15 @@
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impressões digitais\n"
 
-#: g10/g10.c:418
+#: g10/g10.c:438
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:422
+#: g10/g10.c:442
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opções] [arquivos] (-h para ajuda)"
 
-#: g10/g10.c:425
+#: g10/g10.c:445
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -704,7 +719,7 @@
 "assina, verifica, criptografa ou descriptografa\n"
 "a operação padrão depende dos dados de entrada\n"
 
-#: g10/g10.c:432
+#: g10/g10.c:452
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -712,189 +727,194 @@
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:511
+#: g10/g10.c:531
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opções] "
 
-#: g10/g10.c:564
+#: g10/g10.c:584
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/g10.c:704
+#: g10/g10.c:734
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de opções padrão `%s' inexistente\n"
 
-#: g10/g10.c:708
+#: g10/g10.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de opções `%s': %s\n"
 
-#: g10/g10.c:715
+#: g10/g10.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo opções de `%s'\n"
 
-#: g10/g10.c:905
+#: g10/g10.c:950
 #, 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:970
+#: g10/g10.c:1024
 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
+#: g10/g10.c:1028 g10/g10.c:1037
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s não é para uso normal!\n"
 
-#: g10/g10.c:976
+#: g10/g10.c:1030
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s não é permitido com %s!\n"
 
-#: g10/g10.c:979
+#: g10/g10.c:1033
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s não faz sentido com %s!\n"
 
-#: g10/g10.c:998 g10/g10.c:1010
+#: g10/g10.c:1053 g10/g10.c:1065
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado não é válido\n"
 
-#: g10/g10.c:1004 g10/g10.c:1016
+#: g10/g10.c:1059 g10/g10.c:1071
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado não é válido\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1075
 msgid "the given policy URL is invalid\n"
 msgstr "a URL de política dada é inválida\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1078
 #, 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:1025
+#: g10/g10.c:1080
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1027
+#: g10/g10.c:1082
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:1029
+#: g10/g10.c:1084
 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:1032
+#: g10/g10.c:1087
 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:1036
+#: g10/g10.c:1091
 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:1121
+#: g10/g10.c:1176
 #, 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:1127
+#: g10/g10.c:1182
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:1134
+#: g10/g10.c:1189
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:1142
+#: g10/g10.c:1197
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1210
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1223
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1237
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:1199
+#: g10/g10.c:1254
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1262
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuário"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1270
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuário"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1278
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuário [comandos]"
 
-#: g10/g10.c:1239
+#: g10/g10.c:1294
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-usuário"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1297
 msgid "--delete-key user-id"
 msgstr "--delete-key id-usuário"
 
-#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
+#: g10/g10.c:1305
+#, fuzzy
+msgid "--delete-secret-and-public-key user-id"
+msgstr "--delete-secret-key id-usuário"
+
+#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossível abrir %s: %s\n"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1357
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuário] [chaveiro]"
 
-#: g10/g10.c:1360
+#: g10/g10.c:1423
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1368
+#: g10/g10.c:1431
 #, 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:1439
+#: g10/g10.c:1502
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inválido `%s'\n"
 
-#: g10/g10.c:1520
+#: g10/g10.c:1589
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:1524
+#: g10/g10.c:1593
 msgid "Go ahead and type your message ...\n"
 msgstr "Vá em frente e digite sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossível abrir `%s'\n"
 
-#: g10/g10.c:1737
+#: g10/g10.c:1805
 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:1743
+#: g10/g10.c:1811
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -902,88 +922,88 @@
 "um nome de notação deve ter apenas letras, dígitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:1749
+#: g10/g10.c:1817
 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:1757
+#: g10/g10.c:1825
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de notação não deve usar caracteres de controle\n"
 
-#: g10/armor.c:302
+#: g10/armor.c:306
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:335
 msgid "invalid armor header: "
 msgstr "cabeçalho de armadura inválido: "
 
-#: g10/armor.c:338
+#: g10/armor.c:342
 msgid "armor header: "
 msgstr "cabeçalho de armadura: "
 
-#: g10/armor.c:349
+#: g10/armor.c:353
 msgid "invalid clearsig header\n"
 msgstr "cabeçalho de assinatura em texto puro inválido\n"
 
-#: g10/armor.c:401
+#: g10/armor.c:405
 msgid "nested clear text signatures\n"
 msgstr "assinaturas em texto puro aninhadas\n"
 
-#: g10/armor.c:525
+#: g10/armor.c:529
 msgid "invalid dash escaped line: "
 msgstr "linha com hífen inválida: "
 
-#: g10/armor.c:537
+#: g10/armor.c:541
 msgid "unexpected armor:"
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:654
+#: g10/armor.c:667 g10/armor.c:1235
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caractere radix64 inválido %02x ignorado\n"
 
-#: g10/armor.c:697
+#: g10/armor.c:710
 msgid "premature eof (no CRC)\n"
 msgstr "fim de arquivo prematuro (sem CRC)\n"
 
-#: g10/armor.c:731
+#: g10/armor.c:744
 msgid "premature eof (in CRC)\n"
 msgstr "fim de arquivo prematuro (no CRC)\n"
 
-#: g10/armor.c:735
+#: g10/armor.c:748
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:739
+#: g10/armor.c:752 g10/armor.c:1272
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:772
 msgid "premature eof (in Trailer)\n"
 msgstr "fim de arquivo prematuro (no \"Trailer\")\n"
 
-#: g10/armor.c:760
+#: g10/armor.c:776
 msgid "error in trailer line\n"
 msgstr "erro na linha \"trailer\"\n"
 
-#: g10/armor.c:906
+#: g10/armor.c:922
 msgid "For info see http://www.gnupg.org"
 msgstr ""
 
-#: g10/armor.c:1027
+#: g10/armor.c:1050
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP válido encontrado.\n"
 
-#: g10/armor.c:1032
+#: g10/armor.c:1055
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inválida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1036
+#: g10/armor.c:1059
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -992,7 +1012,7 @@
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "       Impressão digital:"
 
@@ -1221,17 +1241,17 @@
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "       Não se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave pública já está presente\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1239,42 +1259,42 @@
 "Você não especificou um identificador de usuário. (pode-se usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "Digite o identificador de usuário: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "Identificador de usuário inexistente.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: chave pública já marcada como destinatário padrão\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
 msgstr "A chave pública está desativada.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignorado: chave pública já marcada com --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinatário padrão desconhecido `%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: erro na verificação da chave: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave pública está desativada\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "nenhum endereço válido\n"
 
@@ -1283,62 +1303,66 @@
 msgstr "escrevendo auto-assinatura\n"
 
 # key binding ???
-#: g10/keygen.c:214
+#: g10/keygen.c:217
 msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
+#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "O tamanho de chave pedido é %u bits\n"
 
-#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
+#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:549
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:551
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (padrão)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:552
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:554
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:546
+#: g10/keygen.c:555
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e criptografia)\n"
 
-#: g10/keygen.c:548
+#: g10/keygen.c:557
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e criptografia)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:561
 msgid "Your selection? "
 msgstr "Sua opção? "
 
-#: g10/keygen.c:563 g10/keygen.c:571
+#: g10/keygen.c:572
 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:585
+#: g10/keygen.c:580
+msgid "The use of this algorithm is deprecated - create anyway? "
+msgstr ""
+
+#: g10/keygen.c:594
 msgid "Invalid selection.\n"
 msgstr "Opção inválida.\n"
 
-#: g10/keygen.c:597
+#: g10/keygen.c:606
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1351,19 +1375,19 @@
 "              tamanho padrão é 1024 bits\n"
 "     tamanho máximo sugerido é 2048 bits\n"
 
-#: g10/keygen.c:604
+#: g10/keygen.c:613
 msgid "What keysize do you want? (1024) "
 msgstr "Que tamanho de chave você quer? (1024) "
 
-#: g10/keygen.c:609
+#: g10/keygen.c:618
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
 
-#: g10/keygen.c:611
+#: g10/keygen.c:620
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
 
-#: g10/keygen.c:613
+#: g10/keygen.c:622
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
@@ -1376,12 +1400,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:624
+#: g10/keygen.c:633
 #, 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:629
+#: g10/keygen.c:638
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1389,11 +1413,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:632
+#: g10/keygen.c:641
 msgid "Are you sure that you want this keysize? "
 msgstr "Você tem certeza de que quer este tamanho de chave? "
 
-#: g10/keygen.c:633
+#: g10/keygen.c:642
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1401,21 +1425,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:641
+#: g10/keygen.c:650
 msgid "Do you really need such a large keysize? "
 msgstr "Você realmente precisa de uma chave tão grande? "
 
-#: g10/keygen.c:647
+#: g10/keygen.c:656
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido é %u bits\n"
 
-#: g10/keygen.c:650 g10/keygen.c:654
+#: g10/keygen.c:659 g10/keygen.c:663
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:702
+#: g10/keygen.c:711
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1431,25 +1455,25 @@
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:717
+#: g10/keygen.c:726
 msgid "Key is valid for? (0) "
 msgstr "A chave é valida por? (0) "
 
-#: g10/keygen.c:722
+#: g10/keygen.c:731
 msgid "invalid value\n"
 msgstr "valor inválido\n"
 
-#: g10/keygen.c:727
+#: g10/keygen.c:736
 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:733
+#: g10/keygen.c:742
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:745
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1457,11 +1481,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:741
+#: g10/keygen.c:750
 msgid "Is this correct (y/n)? "
 msgstr "Está correto (s/n)? "
 
-#: g10/keygen.c:784
+#: g10/keygen.c:793
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1477,44 +1501,44 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:796
+#: g10/keygen.c:805
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:804
+#: g10/keygen.c:813
 msgid "Invalid character in name\n"
 msgstr "Caractere inválido no nome\n"
 
-#: g10/keygen.c:806
+#: g10/keygen.c:815
 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:808
+#: g10/keygen.c:817
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:816
+#: g10/keygen.c:825
 msgid "Email address: "
 msgstr "Endereço de correio eletrônico: "
 
-#: g10/keygen.c:827
+#: g10/keygen.c:836
 msgid "Not a valid email address\n"
 msgstr "Endereço eletrônico inválido\n"
 
-#: g10/keygen.c:835
+#: g10/keygen.c:844
 msgid "Comment: "
 msgstr "Comentário: "
 
-#: g10/keygen.c:841
+#: g10/keygen.c:850
 msgid "Invalid character in comment\n"
 msgstr "Caractere inválido no comentário\n"
 
-#: g10/keygen.c:864
+#: g10/keygen.c:873
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Você está usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:870
+#: g10/keygen.c:879
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1525,28 +1549,28 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:883
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:879
+#: g10/keygen.c:888
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:889
+#: g10/keygen.c:898
 #, 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:890
+#: g10/keygen.c:899
 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:909
+#: g10/keygen.c:918
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:947
+#: g10/keygen.c:956
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1554,11 +1578,11 @@
 "Você precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:964
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "A frase secreta não foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:970
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1570,7 +1594,7 @@
 "qualquer hora, usando este programa com a opção \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:982
+#: g10/keygen.c:991
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1582,29 +1606,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:1431
+#: g10/keygen.c:1440
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA terá 1024 bits.\n"
 
-#: g10/keygen.c:1474
+#: g10/keygen.c:1483
 msgid "Key generation canceled.\n"
 msgstr "Geração de chave cancelada.\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1581
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado público para `%s'\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1582
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1679
 msgid "public and secret key created and signed.\n"
 msgstr "chaves pública e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1684
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1612,12 +1636,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:1690 g10/keygen.c:1791
+#: g10/keygen.c:1701 g10/keygen.c:1807
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1748 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1625,7 +1649,7 @@
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1750 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1633,11 +1657,11 @@
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1783
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1648,17 +1672,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: arquivo vazio\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s criptografado para: %s\n"
@@ -1683,282 +1707,282 @@
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chave %08lX: não é uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:214
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desativado\n"
 
-#: g10/getkey.c:350
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+#, fuzzy
+msgid "[User id not found]"
+msgstr "%s: usuário não encontrado\n"
+
+#: g10/getkey.c:453
 msgid "too many entries in unk cache - disabled\n"
 msgstr "entradas demais no cache unk - desativado\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr "chave RSA não pode ser usada nesta versão\n"
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
-msgstr "Nenhuma chave para identificador de usuário\n"
-
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
-msgstr "Nenhum identificador de usuário para chave\n"
-
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2207
 #, 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:2050
-#, fuzzy
-msgid "[User id not found]"
-msgstr "%s: usuário não encontrado\n"
+#: g10/getkey.c:2249 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/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 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:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Número total processado: %lu\n"
 
-#: g10/import.c:206
+#: g10/import.c:208
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de usuários: %lu\n"
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             não modificados: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de usuários: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revogações de chaves: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas não modificadas: %lu\n"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chave %08lX: sem ID de usuário\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de usuários válidos\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 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:418 g10/import.c:657
+#: g10/import.c:435 g10/import.c:684
 #, 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:423
+#: g10/import.c:440
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "chave %08lX: não é uma chave rfc2440 - ignorada\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "sem chaveiro público padrão\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "impossível bloquear chaveiro `%s': %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "chave %08lX: chave pública importada\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chave %08lX: não corresponde à nossa cópia\n"
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:489 g10/import.c:692
 #, 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:478 g10/import.c:671
+#: g10/import.c:495 g10/import.c:698
 #, 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:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "chave %8lX: 1 novo ID de usuário\n"
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de usuários\n"
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "chave %08lX: não modificada\n"
 
-#: g10/import.c:613
+#: g10/import.c:610
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:640
 #, 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:617
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chave %08lX: já está no chaveiro secreto\n"
 
-#: g10/import.c:622
+#: g10/import.c:649
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta não encontrada: %s\n"
 
-#: g10/import.c:651
+#: g10/import.c:678
 #, 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:682
+#: g10/import.c:709
 #, 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:714
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revogação importado\n"
 
-#: g10/import.c:756
+#: g10/import.c:783
 #, 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:763 g10/import.c:787
+#: g10/import.c:790 g10/import.c:814
 #, 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:764
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "chave %08lX: auto-assinatura inválida\n"
 
-#: g10/import.c:779
+#: g10/import.c:806
 #, 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:788
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX: ligação de subchave inválida\n"
 
-#: g10/import.c:815
+#: g10/import.c:842
 #, 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:844
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chave %08lX: ignorado ID de usuário '"
 
-#: g10/import.c:867
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
@@ -1967,98 +1991,98 @@
 #. * 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:892
+#: g10/import.c:919
 #, 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:901
+#: g10/import.c:928
 #, 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:909
+#: g10/import.c:936
 #, 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:1009
+#: g10/import.c:1036
 #, 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:1060
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chave %08lX: certificado de revogação adicionado\n"
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chave %08lX: nossa cópia não tem auto-assinatura\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: usuário não encontrado\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr "[revogação]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorreta\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorretas\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 assinatura não verificada por falta de chave\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d assinaturas não verificadas por falta de chaves\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura não verificada devido a um erro\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas não verificadas devido a erros\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 ID de usuário sem auto-assinatura válida detectado\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d IDs de usuários sem auto-assinaturas válidas detectados\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Já assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2066,7 +2090,7 @@
 "Você tem certeza de que quer assinar esta chave com\n"
 "sua chave: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2074,34 +2098,34 @@
 "A assinatura será marcada como não-exportável.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "Esta chave não é protegida.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:432
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "chave secreta não disponível"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "A chave é protegida.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossível editar esta chave: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2109,7 +2133,7 @@
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2117,422 +2141,427 @@
 "Você não quer uma frase secreta - provavelmente isto é uma *má* idéia!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "Você realmente quer fazer isso? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a assinatura da chave para o local correto\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr "mostra impressão digital"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de usuários"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
 msgstr "seleciona ID de usuário N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "seleciona chave secundária N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr "lista assinaturas"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr "assina a chave"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
 msgstr "adiciona um novo ID de usuário"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
 msgstr "remove ID de usuário"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr "adiciona nova chave secundária"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "remove uma chave secundária"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
 msgstr "remove assinaturas"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr "muda a data de validade"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "alterna entre listagem de chave secreta e pública"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606 g10/keyedit.c:607
 msgid "list preferences"
 msgstr "lista preferências"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "pref"
+
+#: g10/keyedit.c:608
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:608
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "change the ownertrust"
 msgstr "muda os valores de confiança"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revoke signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revoke a secondary key"
 msgstr "revoga uma chave secundária"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable a key"
 msgstr "desativa uma chave"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable a key"
 msgstr "ativa uma chave"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:633
 msgid "can't do that in batchmode\n"
 msgstr "impossível fazer isso em modo não-interativo\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:669
+#: g10/keyedit.c:671
 msgid "Secret key is available.\n"
 msgstr "Chave secreta disponível.\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:700
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta é necessária para fazer isto.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:781
 msgid "Really sign all user IDs? "
 msgstr "Realmente assinar todos os IDs de usuário? "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:782
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugestão: Selecione os IDs de usuário para assinar\n"
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:814 g10/keyedit.c:1000
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "atualização do banco de dados de confiabilidade falhou: %s\n"
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:825 g10/keyedit.c:846
 msgid "You must select at least one user ID.\n"
 msgstr "Você precisa selecionar pelo menos um ID de usuário.\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:827
 msgid "You can't delete the last user ID!\n"
 msgstr "Você não pode remover o último ID de usuário!\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:830
 msgid "Really remove all selected user IDs? "
 msgstr "Realmente remover todos os IDs de usuário selecionados? "
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:831
 msgid "Really remove this user ID? "
 msgstr "Realmente remover este ID de usuário? "
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:867 g10/keyedit.c:889
 msgid "You must select at least one key.\n"
 msgstr "Você deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:871
 msgid "Do you really want to delete the selected keys? "
 msgstr "Você realmente quer remover as chaves selecionadas? "
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:872
 msgid "Do you really want to delete this key? "
 msgstr "Você realmente quer remover esta chave? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Você realmente quer revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:894
 msgid "Do you really want to revoke this key? "
 msgstr "Você realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
 msgid "Save changes? "
 msgstr "Salvar alterações? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:967
 msgid "Quit without saving? "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:978
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualização falhou: %s\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:985
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualização da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:992
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave não alterada, nenhuma atualização é necessária.\n"
 
 # help ou ajuda ???
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1007
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inválido (tente \"help\")\n"
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1090
+#: g10/keyedit.c:1140
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1144
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1173
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "chave %08lX: a subchave foi revogada!\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1176
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "   novas revogações de chaves: %lu\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1178
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1420
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura válida? (s/N/q)"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1424
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inválida? (s/N/q)"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1428
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1434
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1448
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1449
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1452
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as seleções das chaves secretas.\n"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1527
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor selecione no máximo uma chave secundária.\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1531
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Modificando a data de validade para uma chave secundária.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave primária.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1575
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Você não pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1591
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1652
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usuário com índice %d\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1698
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secundária com índice %d\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1796
 msgid "user ID: \""
 msgstr "ID de usuário: \""
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1799
 #, c-format
 msgid ""
 "\"\n"
@@ -2541,170 +2570,168 @@
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1803
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1827
 msgid "You have signed these user IDs:\n"
 msgstr "Você assinou estes IDs de usuário:\n"
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1846
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1866
 msgid "You are about to revoke these signatures:\n"
 msgstr "Você está prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1884
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Realmente gerar os certificados de revogação? (s/N)"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1913
 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:400 g10/mainproc.c:790
+#: g10/keylist.c:279 g10/mainproc.c:851
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "A chave expira em %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:269
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "a chave pública é %08lX\n"
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:314
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados criptografados com chave pública: DEK válido\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:366
 #, 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:336
+#: g10/mainproc.c:376
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "criptografado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr "nenhuma chave secreta para descriptografia disponível\n"
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:390
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descriptografia de chave pública falhou: %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:430
 msgid "decryption okay\n"
 msgstr "descriptografia correta\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:435
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:440
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:459
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:461
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:632
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revogação isolada - use \"gpg --import\" para aplicá-la\n"
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:719 g10/mainproc.c:728
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de notação inválidos encontrados\n"
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:731
 msgid "Notation: "
 msgstr "Notação: "
 
-#: g10/mainproc.c:680
+#: g10/mainproc.c:740
 msgid "Policy: "
 msgstr "Política: "
 
-#: g10/mainproc.c:1121
+#: g10/mainproc.c:1193
 msgid "signature verification suppressed\n"
 msgstr "verificação de assinatura suprimida\n"
 
-#: g10/mainproc.c:1158
+#. plaintext before signatures but no one-pass packets
+#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#, fuzzy
+msgid "can't handle these multiple signatures\n"
+msgstr "fazer uma assinatura separada"
+
+#: g10/mainproc.c:1256
 #, 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:1184 g10/mainproc.c:1195
+#: g10/mainproc.c:1284 g10/mainproc.c:1292
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1196
+#: g10/mainproc.c:1285 g10/mainproc.c:1293
 msgid "Good signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1243
+#: g10/mainproc.c:1358
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossível verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1318
+#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "fazer uma assinatura separada"
+
+#: g10/mainproc.c:1454
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura isolada da classe 0x%02x\n"
 
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1511
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1518
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inválido detectado em proc_tree()\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossível desativar core dumps: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Algoritmos experimentais não devem ser usados!\n"
 
-#: g10/misc.c:234
-msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
+#: g10/misc.c:238
+#, fuzzy
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
 "este algoritmo de criptografia é depreciado; por favor use algum\n"
 "algoritmo padrão!\n"
@@ -2714,12 +2741,69 @@
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossível manipular algoritmo de chave pública %d\n"
 
-#: g10/parse-packet.c:991
+#: g10/parse-packet.c:1010
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit crítico ligado\n"
 
-#: g10/passphrase.c:159
+#: g10/passphrase.c:223
+msgid "gpg-agent is not available in this session\n"
+msgstr ""
+
+#: g10/passphrase.c:229
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr ""
+
+#: g10/hkp.c:167 g10/passphrase.c:248
+#, fuzzy, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "impossível abrir `%s': %s\n"
+
+#: g10/passphrase.c:313 g10/passphrase.c:576
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr " (ID principal da chave %08lX)"
+
+#: g10/passphrase.c:323
+#, fuzzy, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"\n"
+"Você precisa de uma frase secreta para desbloquear a chave secreta do\n"
+"usuário: \""
+
+#: g10/passphrase.c:344
+#, fuzzy
+msgid "Enter passphrase\n"
+msgstr "Digite a frase secreta: "
+
+#: g10/passphrase.c:346
+#, fuzzy
+msgid "Repeat passphrase\n"
+msgstr "Repita a frase secreta: "
+
+#: g10/passphrase.c:384
+#, fuzzy
+msgid "passphrase too long\n"
+msgstr "linha muito longa\n"
+
+#: g10/passphrase.c:396
+msgid "invalid response from agent\n"
+msgstr ""
+
+#: g10/passphrase.c:405
+msgid "cancelled by user\n"
+msgstr ""
+
+#: g10/passphrase.c:408 g10/passphrase.c:477
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr ""
+
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2729,25 +2813,20 @@
 "Você precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "usuário: \""
 
-#: g10/passphrase.c:168
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:173
-#, c-format
-msgid " (main key ID %08lX)"
-msgstr " (ID principal da chave %08lX)"
-
-#: g10/passphrase.c:190
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
 msgstr "impossível pedir senha em modo não-interativo\n"
 
-#: g10/passphrase.c:194
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:198
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
@@ -2755,19 +2834,24 @@
 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:324
+#: g10/plaintext.c:332
 msgid "Detached signature.\n"
 msgstr "Assinatura separada.\n"
 
-#: g10/plaintext.c:328
+#: g10/plaintext.c:336
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do arquivo de dados: "
 
-#: g10/plaintext.c:349
+#: g10/plaintext.c:357
 msgid "reading stdin ...\n"
 msgstr "lendo de \"stdin\" ...\n"
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:391
+#, fuzzy
+msgid "no signed data\n"
+msgstr "impossível abrir dados assinados `%s'\n"
+
+#: g10/plaintext.c:399
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossível abrir dados assinados `%s'\n"
@@ -2800,41 +2884,36 @@
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: chave de assinatura expirou %s\n"
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr ""
 
-#: g10/hkp.c:85
+#: g10/hkp.c:83
 #, fuzzy, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "impossível escrever para o chaveiro: %s\n"
 
-#: g10/hkp.c:109 g10/hkp.c:148
+#: g10/hkp.c:102 g10/hkp.c:136
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/hkp.c:117
+#: g10/hkp.c:110
 #, 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:170
-#, fuzzy, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "impossível abrir `%s': %s\n"
-
-#: g10/hkp.c:194
+#: g10/hkp.c:191
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:203
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:209
+#: g10/hkp.c:206
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
@@ -2878,30 +2957,35 @@
 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:324
-#, c-format
-msgid "NOTE: signature key expired %s\n"
+#: g10/sig-check.c:328
+#, fuzzy, c-format
+msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTA: chave de assinatura expirou %s\n"
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "assumindo assinatura incorreta devido a um bit crítico desconhecido\n"
 
-#: g10/sign.c:140
+#: g10/sign.c:152
+#, fuzzy, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "lid %lu: leitura de registro de assinatura falhou: %s\n"
+
+#: g10/sign.c:161
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:307 g10/sign.c:630
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossível criar %s: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:405
 msgid "signing:"
 msgstr "assinando:"
 
-#: g10/sign.c:431
+#: g10/sign.c:448
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' é um arquivo vazio\n"
@@ -2940,7 +3024,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diretório inexistente!\n"
 
-#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
+#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: impossível criar: %s\n"
@@ -3123,11 +3207,6 @@
 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"
@@ -3338,7 +3417,7 @@
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "AVISO: ainda é impossível manipular registros de preferências longos\n"
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -3348,7 +3427,7 @@
 "Por favor lembre-se de que o arquivo com a assinatura (.sig ou .asc)\n"
 "deve ser o primeiro arquivo dado na linha de comando.\n"
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linha %u muito longa ou sem LF\n"
@@ -3358,41 +3437,51 @@
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: impossível criar chaveiro: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1374
+#: g10/ringedit.c:319 g10/ringedit.c:1376
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro criado\n"
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1557
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 arquivos com informações confidenciais.\n"
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1558
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s é o não modificado\n"
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1559
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s é o novo\n"
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1560
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte este possível furo de segurança\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "a chave não está marcada como insegura - impossível usá-la com o pseudo "
 "RNG!\n"
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, fuzzy, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "ignorado `%s': %s\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+#, fuzzy
+msgid "skipped: secret key already present\n"
+msgstr "%s: ignorado: a chave pública já está presente\n"
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3420,31 +3509,31 @@
 msgid "Enter new filename"
 msgstr "Digite novo nome de arquivo"
 
-#: g10/openfile.c:182
+#: g10/openfile.c:184
 msgid "writing to stdout\n"
 msgstr "escrevendo em \"stdout\"\n"
 
-#: g10/openfile.c:261
+#: g10/openfile.c:273
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "assumindo dados assinados em `%s'\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:323
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: novo arquivo de opções criado\n"
 
-#: g10/openfile.c:338
+#: g10/openfile.c:350
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: impossível criar diretório: %s\n"
 
-#: g10/openfile.c:341
+#: g10/openfile.c:353
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: diretório criado\n"
 
-#: g10/openfile.c:343
+#: g10/openfile.c:355
 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"
@@ -3467,6 +3556,13 @@
 "AVISO: A mensagem foi criptografada com uma chave fraca na criptografia\n"
 "simétrica.\n"
 
+#: g10/encr-data.c:97
+#, fuzzy
+msgid "problem handling encrypted packet\n"
+msgstr ""
+"eliminar o campo keyid dos pacotes\n"
+"criptografados"
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "chave fraca criada - tentando novamente\n"
@@ -3478,14 +3574,6 @@
 "impossível evitar chave fraca para criptografia simétrica;\n"
 "%d tentativas!\n"
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "há uma chave secreta para esta chave pública!\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr "use a opção \"--delete-secret-key\" para deletá-la antes.\n"
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "impossível fazer isso em modo não-interativo sem \"--yes\"\n"
@@ -3498,6 +3586,14 @@
 msgid "This is a secret key! - really delete? "
 msgstr "Esta é uma chave secreta! - realmente deletar? "
 
+#: g10/delkey.c:181
+msgid "there is a secret key for this public key!\n"
+msgstr "há uma chave secreta para esta chave pública!\n"
+
+#: g10/delkey.c:183
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr "use a opção \"--delete-secret-key\" para deletá-la antes.\n"
+
 #: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
@@ -3741,6 +3837,26 @@
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda disponível para `%s'"
 
+#, fuzzy
+#~ msgid "invalid"
+#~ msgstr "armadura inválida"
+
+#, fuzzy
+#~ msgid "revoked"
+#~ msgstr "revkey"
+
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "chave RSA não pode ser usada nesta versão\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Nenhuma chave para identificador de usuário\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Nenhum identificador de usuário para chave\n"
+
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "nenhuma chave secreta para descriptografia disponível\n"
+
 #~ msgid ""
 #~ "RSA keys are deprecated; please consider creating a new key and use this key "
 #~ "in the future\n"
@@ -3922,9 +4038,6 @@
 #~ msgid "lid %lu: read pref record failed: %s\n"
 #~ msgstr "lid %lu: leitura de registro de preferências falhou: %s\n"
 
-#~ msgid "lid %lu: read sig record failed: %s\n"
-#~ msgstr "lid %lu: leitura de registro de assinatura falhou: %s\n"
-
 #, fuzzy
 #~ msgid "user '%s' read problem: %s\n"
 #~ msgstr "erro de leitura do usuário `%s': %s\n"
@@ -3946,9 +4059,6 @@
 
 #~ msgid "directory record w/o primary key\n"
 #~ msgstr "registro de diretório sem chave primária\n"
-
-#~ msgid "line too long\n"
-#~ msgstr "linha muito longa\n"
 
 #~ msgid "error: missing colon\n"
 #~ msgstr "erro: falta dois pontos\n"
diff -urN gnupg-1.0.4/po/pt_PT.po gnupg-1.0.5/po/pt_PT.po
--- gnupg-1.0.4/po/pt_PT.po	Tue Oct 17 15:40:40 2000
+++ gnupg-1.0.5/po/pt_PT.po	Sun Apr 29 16:39:30 2001
@@ -1,54 +1,54 @@
-# PT_pt messages for gnupg
-# Pedro Morais <morais@poli.org>
+# pt_PT messages for gnupg
+# Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+# Pedro Morais <morais@kde.org>
 #
-# Based on PT_br work done by:
-# Thiago Jung Bauermann <jungmann@cwb.matrix.com.br>, 1999.
-# Rafael Caetano dos Santos <rcaetano@linux.ime.usp.br>.
+# Based on pt_PT work done by:
+# Thiago Jung Bauermann <jungmann@cwb.matrix.com.br>
+# Rafael Caetano dos Santos <rcaetano@linux.ime.usp.br>
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 2000-10-16 19:22+0200\n"
-"PO-Revision-Date: 1999-09-09 20:28+0000\n"
-"Last-Translator: Pedro Morais <morais@poli.org>\n"
-"Language-Team: pt\n"
-"MIME-Version:\n"
-"Content-Type:\n"
-"Content-Transfer-Encoding:\n"
+"POT-Creation-Date: 2001-04-29 16:39+0200\n"
+"PO-Revision-Date: 2001-04-08 16:28+00:00\n"
+"Last-Translator: Pedro Morais <morais@kde.org>\n"
+"Language-Team: pt <morais@kde.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-latin-1\n"
+"Content-Transfer-Encoding: none\n"
 
 #: util/secmem.c:79
 msgid "Warning: using insecure memory!\n"
 msgstr "Aviso: a utilizar memória insegura!\n"
 
-#: util/secmem.c:295
+#: util/secmem.c:299
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "a operação não é possível sem memória segura inicializada\n"
 
-#: util/secmem.c:296
+#: util/secmem.c:300
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(você pode ter usado o programa errado para esta tarefa)\n"
 
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:287 util/miscutil.c:316
 msgid "yes"
 msgstr "sim"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:288 util/miscutil.c:319
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:289 util/miscutil.c:317
 msgid "no"
 msgstr "não"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:290 util/miscutil.c:320
 msgid "nN"
 msgstr "nN"
 
-# INICIO MENU
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:318
 msgid "quit"
 msgstr "sair"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:321
 msgid "qQ"
 msgstr "qQ"
 
@@ -248,6 +248,15 @@
 msgid "not processed"
 msgstr "não processado"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+msgid "unusable public key"
+msgstr "chave pública não utilizável"
+
+#: util/errors.c:106
+msgid "unusable secret key"
+msgstr "chave secreta não utilizável"
+
 #: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -258,63 +267,64 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "você encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: cipher/random.c:315
-#, fuzzy, c-format
+#: cipher/random.c:324
+#, c-format
 msgid "can't stat `%s': %s\n"
-msgstr "impossível abrir `%s': %s\n"
+msgstr "impossível 'stat' a `%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:329
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
-msgstr ""
+msgstr "`%s' não é um ficheiro normal - ignorado\n"
 
-#: cipher/random.c:325
+#: cipher/random.c:334
 msgid "note: random_seed file is empty\n"
-msgstr ""
+msgstr "nota: random_seed está vazia\n"
 
-#: cipher/random.c:331
+#: cipher/random.c:340
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
+"aviso: o ficheiro random_seed tem um tamanho inválido - não utilizado\n"
 
-#: cipher/random.c:339
-#, fuzzy, c-format
+#: cipher/random.c:348
+#, c-format
 msgid "can't read `%s': %s\n"
-msgstr "impossível abrir `%s': %s\n"
+msgstr "impossível ler `%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:386
 msgid "note: random_seed file not updated\n"
-msgstr ""
+msgstr "nota: ficheiro random_seed não actualizado\n"
 
-#: cipher/random.c:397
-#, fuzzy, c-format
+#: cipher/random.c:406
+#, c-format
 msgid "can't create `%s': %s\n"
-msgstr "impossível criar %s: %s\n"
+msgstr "impossível criar `%s': %s\n"
 
-#: cipher/random.c:404
-#, fuzzy, c-format
+#: cipher/random.c:413
+#, c-format
 msgid "can't write `%s': %s\n"
-msgstr "impossível abrir `%s': %s\n"
+msgstr "impossível escrever `%s': %s\n"
 
-#: cipher/random.c:407
-#, fuzzy, c-format
+#: cipher/random.c:416
+#, c-format
 msgid "can't close `%s': %s\n"
-msgstr "impossível abrir `%s': %s\n"
+msgstr "impossível fechar `%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:427
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
-msgstr ""
+msgstr "demasiados bits aletórios pedidos; o limite são %d\n"
 
-#: cipher/random.c:650
+#: cipher/random.c:661
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: a utilizar gerador de números aleatórios inseguro!\n"
 
-#: cipher/random.c:651
+#: cipher/random.c:662
 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 +349,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:206
+#: g10/g10.c:216
 msgid ""
 "@Commands:\n"
 " "
@@ -347,140 +357,139 @@
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:208
+#: g10/g10.c:218
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/g10.c:209
+#: g10/g10.c:219
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:210
+#: g10/g10.c:220
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:211
+#: g10/g10.c:221
 msgid "encrypt data"
 msgstr "encriptar dados"
 
-#: g10/g10.c:212
+#: g10/g10.c:222
 msgid "encryption only with symmetric cipher"
 msgstr "encriptar apenas com cifra simétrica"
 
-#: g10/g10.c:213
+#: g10/g10.c:223
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:214
+#: g10/g10.c:224
 msgid "decrypt data (default)"
 msgstr "desencriptar dados (acção por omissão)"
 
-#: g10/g10.c:215
+#: g10/g10.c:225
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:217
+#: g10/g10.c:227
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:219
+#: g10/g10.c:229
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:220
+#: g10/g10.c:230
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:221
+#: g10/g10.c:231
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impressões digitais"
 
-#: g10/g10.c:222
+#: g10/g10.c:232
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:223
+#: g10/g10.c:233
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:224
+#: g10/g10.c:234
 msgid "remove key from the public keyring"
 msgstr "remover a chave do porta-chaves público"
 
-#: g10/g10.c:226
+#: g10/g10.c:236
 msgid "remove key from the secret keyring"
 msgstr "remover a chave do porta-chaves secreto"
 
-#: g10/g10.c:227
+#: g10/g10.c:237
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:228
+#: g10/g10.c:238
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:229
+#: g10/g10.c:239
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:230
+#: g10/g10.c:240
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revogação"
 
-#: g10/g10.c:231
+#: g10/g10.c:241
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:232
+#: g10/g10.c:242
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:233
+#: g10/g10.c:243
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:237
+#: g10/g10.c:247
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:239
+#: g10/g10.c:249
 msgid "list only the sequence of packets"
 msgstr "listar apenas as sequências de pacotes"
 
-# ownertrust ???
-#: g10/g10.c:241
+#: g10/g10.c:251
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confiança"
 
-#: g10/g10.c:243
+#: g10/g10.c:253
 msgid "import ownertrust values"
 msgstr "importar os valores de confiança"
 
-#: g10/g10.c:245
+#: g10/g10.c:255
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confiança"
 
-#: g10/g10.c:247
+#: g10/g10.c:257
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMES]|verificar a base de dados de confiança"
 
-#: g10/g10.c:248
+#: g10/g10.c:258
 msgid "fix a corrupted trust database"
 msgstr "consertar uma base de dados de confiança"
 
-#: g10/g10.c:249
+#: g10/g10.c:259
 msgid "De-Armor a file or stdin"
 msgstr "retirar armadura de um ficheiro ou do \"stdin\""
 
-#: g10/g10.c:251
+#: g10/g10.c:261
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um ficheiro ou \"stdin\""
 
-#: g10/g10.c:253
+#: g10/g10.c:263
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:257
+#: g10/g10.c:267
 msgid ""
 "@\n"
 "Options:\n"
@@ -490,175 +499,181 @@
 "Opções:\n"
 " "
 
-#: g10/g10.c:259
+#: g10/g10.c:269
 msgid "create ascii armored output"
 msgstr "criar saída com armadura ascii"
 
-#: g10/g10.c:261
+#: g10/g10.c:271
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|encriptar para NOME"
 
-#: g10/g10.c:264
+#: g10/g10.c:274
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinatário padrão"
 
-#: g10/g10.c:266
+#: g10/g10.c:276
 msgid "use the default key as default recipient"
 msgstr "usar a chave padrão como destinatário padrão"
 
-#: g10/g10.c:270
+#: g10/g10.c:280
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou desencriptar"
 
-#: g10/g10.c:271
+#: g10/g10.c:281
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer nível de compressão N\n"
 "(0 desactiva)"
 
-#: g10/g10.c:273
+#: g10/g10.c:283
 msgid "use canonical text mode"
 msgstr "usar modo de texto canônico"
 
-#: g10/g10.c:274
+#: g10/g10.c:284
 msgid "use as output file"
 msgstr "usar como ficheiro de saída"
 
-#: g10/g10.c:275
+#: g10/g10.c:285
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:276
+#: g10/g10.c:286
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:277
+#: g10/g10.c:287
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:278
+#: g10/g10.c:288
 msgid "force v3 signatures"
 msgstr "forçar assinaturas v3"
 
-#: g10/g10.c:279
+#: g10/g10.c:289
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para encriptar"
 
-#: g10/g10.c:280
+#: g10/g10.c:290
 msgid "do not make any changes"
 msgstr "não fazer alterações"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:282
+#: g10/g10.c:292
+msgid "use the gpg-agent"
+msgstr "utilizar o gpg-agent"
+
+#: g10/g10.c:293
 msgid "batch mode: never ask"
 msgstr "modo não-interactivo: nunca perguntar"
 
-#: g10/g10.c:283
+#: g10/g10.c:294
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:284
+#: g10/g10.c:295
 msgid "assume no on most questions"
 msgstr "assumir não para a maioria das perguntas"
 
-#: g10/g10.c:285
+#: g10/g10.c:296
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "adicionar este porta-chaves\n"
 "à lista de porta-chaves"
 
-#: g10/g10.c:286
+#: g10/g10.c:297
 msgid "add this secret keyring to the list"
 msgstr "adicionar este porta-chaves secreto à lista"
 
-#: g10/g10.c:287
+#: g10/g10.c:298
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omissão"
 
-#: g10/g10.c:288
+#: g10/g10.c:299
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDEREÇO|usar este servidor para buscar chaves"
 
-#: g10/g10.c:289
+#: g10/g10.c:300
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:290
+#: g10/g10.c:301
 msgid "read options from file"
 msgstr "ler opções do ficheiro"
 
-#: g10/g10.c:294
+#: g10/g10.c:305
 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:299
+#: g10/g10.c:310
 msgid "|KEYID|ulimately trust this key"
-msgstr ""
+msgstr "|KEYID|confiar totalmente nesta chave"
 
-#: g10/g10.c:300
+#: g10/g10.c:311
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: g10/g10.c:301
+#: g10/g10.c:312
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:302
+#: g10/g10.c:313
 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:303
+#: g10/g10.c:314
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar mode de frase secreta N"
 
-#: g10/g10.c:305
+#: g10/g10.c:316
 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:307
+#: g10/g10.c:318
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:308
+#: g10/g10.c:319
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:309
+#: g10/g10.c:320
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:310
+#: g10/g10.c:321
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compressão N"
 
-#: g10/g10.c:311
+#: g10/g10.c:322
 msgid "throw keyid field of encrypted packets"
 msgstr "eliminar campo keyid dos pacotes encriptados"
 
-#: g10/g10.c:312
+#: g10/g10.c:323
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes dados de notação"
 
-#: g10/g10.c:315
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
+"@\n"
+"(Veja a página man para uma lista completa de comandos e opções)\n"
 
-#: g10/g10.c:318
+#: g10/g10.c:329
 msgid ""
 "@\n"
 "Examples:\n"
@@ -678,15 +693,15 @@
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impressões digitais\n"
 
-#: g10/g10.c:418
+#: g10/g10.c:438
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:422
+#: g10/g10.c:442
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: g10/g10.c:425
+#: g10/g10.c:445
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -696,7 +711,7 @@
 "assina, verifica, encripta ou desencripta\n"
 "a operação por omissão depende dos dados de entrada\n"
 
-#: g10/g10.c:432
+#: g10/g10.c:452
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -704,189 +719,192 @@
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:511
+#: g10/g10.c:531
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opções] "
 
-#: g10/g10.c:564
+#: g10/g10.c:584
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/g10.c:704
+#: g10/g10.c:734
 #, 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:708
+#: g10/g10.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opções `%s': %s\n"
 
-#: g10/g10.c:715
+#: g10/g10.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler opções de `%s'\n"
 
-#: g10/g10.c:905
+#: g10/g10.c:950
 #, 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:970
+#: g10/g10.c:1024
 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
+#: g10/g10.c:1028 g10/g10.c:1037
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s não é para uso normal!\n"
 
-#: g10/g10.c:976
+#: g10/g10.c:1030
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s não é permitido com %s!\n"
 
-#: g10/g10.c:979
+#: g10/g10.c:1033
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s não faz sentido com %s!\n"
 
-#: g10/g10.c:998 g10/g10.c:1010
+#: g10/g10.c:1053 g10/g10.c:1065
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado não é válido\n"
 
-#: g10/g10.c:1004 g10/g10.c:1016
+#: g10/g10.c:1059 g10/g10.c:1071
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado não é válido\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1075
 msgid "the given policy URL is invalid\n"
 msgstr "a URL de política dada é inválida\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1078
 #, 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:1025
+#: g10/g10.c:1080
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1027
+#: g10/g10.c:1082
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:1029
+#: g10/g10.c:1084
 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:1032
+#: g10/g10.c:1087
 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:1036
+#: g10/g10.c:1091
 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:1121
+#: g10/g10.c:1176
 #, 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:1127
+#: g10/g10.c:1182
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/g10.c:1134
+#: g10/g10.c:1189
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:1142
+#: g10/g10.c:1197
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1210
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1223
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1237
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/g10.c:1199
+#: g10/g10.c:1254
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1262
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1270
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1278
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/g10.c:1239
+#: g10/g10.c:1294
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-utilizador"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1297
 msgid "--delete-key user-id"
 msgstr "--delete-key id-utilizador"
 
-#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
+#: g10/g10.c:1305
+msgid "--delete-secret-and-public-key user-id"
+msgstr "--delete-secret-and-public-key id-utilizador"
+
+#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossível abrir %s: %s\n"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1357
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/g10.c:1360
+#: g10/g10.c:1423
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1368
+#: g10/g10.c:1431
 #, 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:1439
+#: g10/g10.c:1502
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
-msgstr "algoritmo de hash inválido `%s'\n"
+msgstr "algoritmo de dispersão inválido `%s'\n"
 
-#: g10/g10.c:1520
+#: g10/g10.c:1589
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/g10.c:1524
+#: g10/g10.c:1593
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossível abrir `%s'\n"
 
-#: g10/g10.c:1737
+#: g10/g10.c:1805
 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:1743
+#: g10/g10.c:1811
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -894,88 +912,88 @@
 "um nome de notação deve ter apenas letras, dígitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:1749
+#: g10/g10.c:1817
 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:1757
+#: g10/g10.c:1825
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de notação não deve usar caracteres de controle\n"
 
-#: g10/armor.c:302
+#: g10/armor.c:306
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:335
 msgid "invalid armor header: "
 msgstr "cabeçalho de armadura inválido: "
 
-#: g10/armor.c:338
+#: g10/armor.c:342
 msgid "armor header: "
 msgstr "cabeçalho de armadura: "
 
-#: g10/armor.c:349
+#: g10/armor.c:353
 msgid "invalid clearsig header\n"
 msgstr "cabeçalho de assinatura em texto puro inválido\n"
 
-#: g10/armor.c:401
+#: g10/armor.c:405
 msgid "nested clear text signatures\n"
 msgstr "assinaturas em texto puro aninhadas\n"
 
-#: g10/armor.c:525
+#: g10/armor.c:529
 msgid "invalid dash escaped line: "
 msgstr "linha com hífen inválida: "
 
-#: g10/armor.c:537
+#: g10/armor.c:541
 msgid "unexpected armor:"
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:654
+#: g10/armor.c:667 g10/armor.c:1235
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracter radix64 inválido %02x ignorado\n"
 
-#: g10/armor.c:697
+#: g10/armor.c:710
 msgid "premature eof (no CRC)\n"
 msgstr "fim de ficheiro prematuro (sem CRC)\n"
 
-#: g10/armor.c:731
+#: g10/armor.c:744
 msgid "premature eof (in CRC)\n"
 msgstr "fim de ficheiro prematuro (no CRC)\n"
 
-#: g10/armor.c:735
+#: g10/armor.c:748
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:739
+#: g10/armor.c:752 g10/armor.c:1272
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:772
 msgid "premature eof (in Trailer)\n"
 msgstr "fim de ficheiro prematuro (no \"Trailer\")\n"
 
-#: g10/armor.c:760
+#: g10/armor.c:776
 msgid "error in trailer line\n"
-msgstr "erro na linha \"trailer\"\n"
+msgstr "erro na última linha\n"
 
-#: g10/armor.c:906
+#: g10/armor.c:922
 msgid "For info see http://www.gnupg.org"
-msgstr ""
+msgstr "Para mais informações veja http://www.gnupg.org"
 
-#: g10/armor.c:1027
+#: g10/armor.c:1050
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP válido encontrado.\n"
 
-#: g10/armor.c:1032
+#: g10/armor.c:1055
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inválida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1036
+#: g10/armor.c:1059
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -984,7 +1002,7 @@
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "       Impressão digital:"
 
@@ -994,33 +1012,31 @@
 
 #: g10/pkclist.c:116
 msgid "No reason specified"
-msgstr ""
+msgstr "Nenhum motivo especificado"
 
 #: g10/pkclist.c:118
-#, fuzzy
 msgid "Key is superseded"
-msgstr "A chave é protegida.\n"
+msgstr "A chave foi substituída"
 
 #: g10/pkclist.c:120
-#, fuzzy
 msgid "Key has been compromised"
-msgstr "Esta chave foi desactivada"
+msgstr "A chave foi comprometida"
 
 #: g10/pkclist.c:122
 msgid "Key is no longer used"
-msgstr ""
+msgstr "A chave já não é utilizada"
 
 #: g10/pkclist.c:124
 msgid "User ID is no longer valid"
-msgstr ""
+msgstr "O identificador do utilizador já não é válido"
 
 #: g10/pkclist.c:128
 msgid "Reason for revocation: "
-msgstr ""
+msgstr "Motivo da revocação: "
 
 #: g10/pkclist.c:145
 msgid "Revocation comment: "
-msgstr ""
+msgstr "Comentário da revocação: "
 
 #. a string with valid answers
 #: g10/pkclist.c:303
@@ -1214,17 +1230,17 @@
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Não se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave pública já está presente\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1232,42 +1248,42 @@
 "Você não especificou um identificador de utilizador. (pode-se usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "Digite o identificador de utilizador: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "Identificador de utilizador inexistente.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: chave pública já colocada como destinatário por omissão\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
 msgstr "A chave pública está desativada.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignorado: a chave pública já colocada com --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinatário padrão desconhecido `%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: erro na verificação da chave: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave pública está desactivada\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "nenhum endereço válido\n"
 
@@ -1275,63 +1291,66 @@
 msgid "writing self signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
-# key binding ???
-#: g10/keygen.c:214
+#: g10/keygen.c:217
 msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
-#, fuzzy, c-format
+#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
+#, c-format
 msgid "keysize invalid; using %u bits\n"
-msgstr "O tamanho de chave pedido é %u bits\n"
+msgstr "tamanho de chave inválido; a utilizar %u bits\n"
 
-#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
-#, fuzzy, c-format
+#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
+#, c-format
 msgid "keysize rounded up to %u bits\n"
-msgstr "arredondado para %u bits\n"
+msgstr "tamanho da chave arredondado para %u bits\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:549
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:551
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por omissão)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:552
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:554
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (apenas encripção)\n"
+msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:546
+#: g10/keygen.c:555
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (assinatura e encriptação)\n"
+msgstr "   (%d) ElGamal (assinatura e cifragem)\n"
 
-#: g10/keygen.c:548
-#, fuzzy, c-format
+#: g10/keygen.c:557
+#, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (assinatura e encriptação)\n"
+msgstr "   (%d) RSA (assinatura e cifragem)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:561
 msgid "Your selection? "
 msgstr "Opção? "
 
-#: g10/keygen.c:563 g10/keygen.c:571
+#: g10/keygen.c:572
 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:585
+#: g10/keygen.c:580
+msgid "The use of this algorithm is deprecated - create anyway? "
+msgstr "A utilização destes algoritmos está desactualizada - criar na mesma?"
+
+#: g10/keygen.c:594
 msgid "Invalid selection.\n"
 msgstr "Opção inválida.\n"
 
-#: g10/keygen.c:597
+#: g10/keygen.c:606
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1344,22 +1363,21 @@
 "         tamanho por omissão é 1024 bits\n"
 "     tamanho máximo sugerido é 2048 bits\n"
 
-#: g10/keygen.c:604
+#: g10/keygen.c:613
 msgid "What keysize do you want? (1024) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/keygen.c:609
+#: g10/keygen.c:618
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
 
-#: g10/keygen.c:611
+#: g10/keygen.c:620
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
 
-#: g10/keygen.c:613
-#, fuzzy
+#: g10/keygen.c:622
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
+msgstr "tamanho muito pequeno; 1024 é o valor mínimo permitido para RSA.\n"
 
 #. It is ridiculous and an annoyance to use larger key sizes!
 #. * GnuPG can handle much larger sizes; but it takes an eternity
@@ -1369,12 +1387,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:624
+#: g10/keygen.c:633
 #, 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:629
+#: g10/keygen.c:638
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1382,11 +1400,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:632
+#: g10/keygen.c:641
 msgid "Are you sure that you want this keysize? "
 msgstr "Você tem certeza de que quer este tamanho de chave? "
 
-#: g10/keygen.c:633
+#: g10/keygen.c:642
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1394,21 +1412,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:641
+#: g10/keygen.c:650
 msgid "Do you really need such a large keysize? "
 msgstr "Você precisa realmente de uma chave tão grande? "
 
-#: g10/keygen.c:647
+#: g10/keygen.c:656
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido é %u bits\n"
 
-#: g10/keygen.c:650 g10/keygen.c:654
+#: g10/keygen.c:659 g10/keygen.c:663
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:702
+#: g10/keygen.c:711
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1424,25 +1442,25 @@
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:717
+#: g10/keygen.c:726
 msgid "Key is valid for? (0) "
 msgstr "A chave é valida por? (0) "
 
-#: g10/keygen.c:722
+#: g10/keygen.c:731
 msgid "invalid value\n"
 msgstr "valor inválido\n"
 
-#: g10/keygen.c:727
+#: g10/keygen.c:736
 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:733
+#: g10/keygen.c:742
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:745
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1450,11 +1468,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:741
+#: g10/keygen.c:750
 msgid "Is this correct (y/n)? "
 msgstr "Está correto (s/n)? "
 
-#: g10/keygen.c:784
+#: g10/keygen.c:793
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1471,44 +1489,44 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:796
+#: g10/keygen.c:805
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:804
+#: g10/keygen.c:813
 msgid "Invalid character in name\n"
 msgstr "Caracter inválido no nome\n"
 
-#: g10/keygen.c:806
+#: g10/keygen.c:815
 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:808
+#: g10/keygen.c:817
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:816
+#: g10/keygen.c:825
 msgid "Email address: "
 msgstr "Endereço de correio eletrónico: "
 
-#: g10/keygen.c:827
+#: g10/keygen.c:836
 msgid "Not a valid email address\n"
 msgstr "Endereço eletrónico inválido\n"
 
-#: g10/keygen.c:835
+#: g10/keygen.c:844
 msgid "Comment: "
 msgstr "Comentário: "
 
-#: g10/keygen.c:841
+#: g10/keygen.c:850
 msgid "Invalid character in comment\n"
 msgstr "Caracter inválido no comentário\n"
 
-#: g10/keygen.c:864
+#: g10/keygen.c:873
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Você está usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:870
+#: g10/keygen.c:879
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1519,28 +1537,29 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:883
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
+"Por favor não coloque o endereço de email no nome verdadeiro ou no "
+"comentário\n"
 
-#: g10/keygen.c:879
+#: g10/keygen.c:888
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:889
-#, fuzzy
+#: g10/keygen.c:898
 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? "
+msgstr "Mudar (N)ome, (C)omentário, (E)mail ou (S)air? "
 
-#: g10/keygen.c:890
+#: g10/keygen.c:899
 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:909
+#: g10/keygen.c:918
 msgid "Please correct the error first\n"
-msgstr ""
+msgstr "Por favor corrija primeiro o erro\n"
 
-#: g10/keygen.c:947
+#: g10/keygen.c:956
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1548,11 +1567,11 @@
 "Você precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:964
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "a frase secreta não foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:970
 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 +1583,7 @@
 "qualquer hora, usando este programa com a opção \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:982
+#: g10/keygen.c:991
 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 +1595,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:1431
+#: g10/keygen.c:1440
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA terá 1024 bits.\n"
 
-#: g10/keygen.c:1474
+#: g10/keygen.c:1483
 msgid "Key generation canceled.\n"
 msgstr "Geração de chave cancelada.\n"
 
-#: g10/keygen.c:1571
-#, fuzzy, c-format
+#: g10/keygen.c:1581
+#, c-format
 msgid "writing public key to `%s'\n"
-msgstr "escrevendo certificado público para `%s'\n"
+msgstr "a escrever chave pública para `%s'\n"
 
-#: g10/keygen.c:1572
-#, fuzzy, c-format
+#: g10/keygen.c:1582
+#, c-format
 msgid "writing secret key to `%s'\n"
-msgstr "escrevendo certificado privado para `%s'\n"
+msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1679
 msgid "public and secret key created and signed.\n"
 msgstr "chaves pública e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1684
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1606,12 +1625,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:1690 g10/keygen.c:1791
+#: g10/keygen.c:1701 g10/keygen.c:1807
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1748 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1619,7 +1638,7 @@
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1750 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1627,11 +1646,11 @@
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1783
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1642,17 +1661,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: ficheiro vazio\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s encriptado para: %s\n"
@@ -1673,286 +1692,285 @@
 msgstr "chave %08lX: não é uma chave rfc2440 - ignorada\n"
 
 #: g10/export.c:182
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: not protected - skipped\n"
-msgstr "chave %08lX: não é uma chave rfc2440 - ignorada\n"
+msgstr "chave %08lX: não está protegida - ignorada\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:214
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desactivado\n"
 
-#: g10/getkey.c:350
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+msgid "[User id not found]"
+msgstr "[Utilizador não encontrado]"
+
+#: g10/getkey.c:453
 msgid "too many entries in unk cache - disabled\n"
 msgstr "entradas demais no cache unk - desactivado\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr "chave RSA não pode ser usada nesta versão\n"
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
-msgstr "Nenhuma chave para identificador de utilizador\n"
-
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
-msgstr "Nenhum identificador de utilizador para chave\n"
-
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2207
 #, 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:2050
-#, fuzzy
-msgid "[User id not found]"
-msgstr "%s: utilizador não encontrado\n"
+#: g10/getkey.c:2249 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/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 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:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Número total processado: %lu\n"
 
-#: g10/import.c:206
-#, fuzzy, c-format
+#: g10/import.c:208
+#, c-format
 msgid "      skipped new keys: %lu\n"
-msgstr "           novas subchaves: %lu\n"
+msgstr "      ignorei novas chaves: %lu\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de utilizadores: %lu\n"
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             não modificados: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de utilizadores: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revogações de chaves: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas não modificadas: %lu\n"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de utilizadores válidos\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 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:418 g10/import.c:657
+#: g10/import.c:435 g10/import.c:684
 #, 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:423
-#, fuzzy, c-format
+#: g10/import.c:440
+#, c-format
 msgid "key %08lX: new key - skipped\n"
-msgstr "chave %08lX: não é uma chave rfc2440 - ignorada\n"
+msgstr "chave %08lX: chave nova - ignorada\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "sem porta-chaves público padrão\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "impossível trancar porta-chaves `%s': %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "chave %08lX: chave pública importada\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chave %08lX: não corresponde à nossa cópia\n"
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:489 g10/import.c:692
 #, 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:478 g10/import.c:671
+#: g10/import.c:495 g10/import.c:698
 #, 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:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "chave %8lX: 1 novo ID de utilizador\n"
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de utilizadores\n"
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "chave %08lX: não modificada\n"
 
-#: g10/import.c:613
+#: g10/import.c:610
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr "chave secreta %08lX não foi importada (utilize %s para o permitir)\n"
+
+#: g10/import.c:640
 #, 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:617
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chave %08lX: já está no porta-chaves secreto\n"
 
-#: g10/import.c:622
+#: g10/import.c:649
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta não encontrada: %s\n"
 
-#: g10/import.c:651
+#: g10/import.c:678
 #, 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:682
+#: g10/import.c:709
 #, 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:714
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revogação importado\n"
 
-#: g10/import.c:756
+#: g10/import.c:783
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n"
 
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:790 g10/import.c:814
 #, 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:764
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "chave %08lX: auto-assinatura inválida\n"
 
-#: g10/import.c:779
+#: g10/import.c:806
 #, 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:788
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX: ligação de subchave inválida\n"
 
-#: g10/import.c:815
+#: g10/import.c:842
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '"
 
-#: g10/import.c:844
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chave %08lX: ignorado ID de utilizador '"
 
-#: g10/import.c:867
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
@@ -1961,98 +1979,98 @@
 #. * 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:892
+#: g10/import.c:919
 #, 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:901
+#: g10/import.c:928
 #, 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:909
+#: g10/import.c:936
 #, 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:1009
+#: g10/import.c:1036
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
 
-#: g10/import.c:1060
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chave %08lX: certificado de revogação adicionado\n"
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1202 g10/import.c:1255
 #, 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"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: utilizador não encontrado\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr "[revogação]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorrecta\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorrectas\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 assinatura não verificada por falta de chave\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d assinaturas não verificadas por falta de chaves\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura não verificada devido a um erro\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas não verificadas devido a erros\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 ID de utilizador sem auto-assinatura válida detectado\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d IDs de utilizadores sem auto-assinaturas válidas detectados\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Já assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2060,7 +2078,7 @@
 "Você tem certeza de que quer assinar esta chave com\n"
 "a sua chave: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2068,34 +2086,33 @@
 "A assinatura será marcada como não-exportável.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "Esta chave não é protegida.\n"
 
-#: g10/keyedit.c:431
-#, fuzzy
+#: g10/keyedit.c:432
 msgid "Secret parts of primary key are not available.\n"
-msgstr "chave secreta não disponível"
+msgstr "Componentes secretas da chave primária não disponíveis.\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "A chave é protegida.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossível editar esta chave: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2103,7 +2120,7 @@
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2111,422 +2128,425 @@
 "Você não quer uma frase secreta - provavelmente isto é uma *má* idéia!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "Você quer realmente fazer isso? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr "a mover a assinatura da chave para o local correcto\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr "mostra impressão digital"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de utilizadores"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "seleciona chave secundária N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr "lista assinaturas"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr "assina a chave"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
 msgstr "adiciona um novo ID de utilizador"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
 msgstr "remove ID de utilizador"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr "adiciona nova chave secundária"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "remove uma chave secundária"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
 msgstr "remove assinaturas"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr "muda a data de validade"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "alterna entre listagem de chave secreta e pública"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606 g10/keyedit.c:607
 msgid "list preferences"
 msgstr "lista preferências"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "pref"
+
+#: g10/keyedit.c:608
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:608
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "change the ownertrust"
 msgstr "muda os valores de confiança"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revoke signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revoke a secondary key"
 msgstr "revoga uma chave secundária"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable a key"
 msgstr "desactiva uma chave"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable a key"
 msgstr "activa uma chave"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:633
 msgid "can't do that in batchmode\n"
 msgstr "impossível fazer isso em modo não-interativo\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:669
+#: g10/keyedit.c:671
 msgid "Secret key is available.\n"
 msgstr "Chave secreta disponível.\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:700
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta é necessária para fazer isto.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Please use the command \"toggle\" first.\n"
-msgstr ""
+msgstr "Por favor utilize o comando \"toggle\" primeiro.\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:781
 msgid "Really sign all user IDs? "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:782
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugestão: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:814 g10/keyedit.c:1000
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "actualização da base de dados de confiança falhou: %s\n"
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:825 g10/keyedit.c:846
 msgid "You must select at least one user ID.\n"
 msgstr "Você precisa selecionar pelo menos um ID de utilizador.\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:827
 msgid "You can't delete the last user ID!\n"
 msgstr "Você não pode remover o último ID de utilizador!\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:830
 msgid "Really remove all selected user IDs? "
 msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:831
 msgid "Really remove this user ID? "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:867 g10/keyedit.c:889
 msgid "You must select at least one key.\n"
 msgstr "Você deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:871
 msgid "Do you really want to delete the selected keys? "
 msgstr "Você quer realmente remover as chaves selecionadas? "
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:872
 msgid "Do you really want to delete this key? "
 msgstr "Você quer realmente remover esta chave? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Você quer realmente revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:894
 msgid "Do you really want to revoke this key? "
 msgstr "Você quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
 msgid "Save changes? "
 msgstr "Gravar alterações? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:967
 msgid "Quit without saving? "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:978
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualização falhou: %s\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:985
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualização da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:992
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave não alterada, nenhuma actualização é necessária.\n"
 
-# help ou ajuda ???
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1007
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inválido (tente \"help\")\n"
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
-msgstr ""
+msgstr "%s%c %4u%c/%08lX  criada: %s expira: %s"
 
-#: g10/keyedit.c:1090
+#: g10/keyedit.c:1140
 #, c-format
 msgid " trust: %c/%c"
-msgstr ""
+msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1144
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:1123
-#, fuzzy, c-format
+#: g10/keyedit.c:1173
+#, c-format
 msgid "rev! subkey has been revoked: %s\n"
-msgstr "chave %08lX: a subchave foi revogada!\n"
+msgstr "rev! subchave foi revogada: %s\n"
 
-#: g10/keyedit.c:1126
-#, fuzzy
+#: g10/keyedit.c:1176
 msgid "rev- faked revocation found\n"
-msgstr "   novas revogações de chaves: %lu\n"
+msgstr "rev- revogação falsa encontrada\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1178
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
-msgstr ""
+msgstr "rev? problema ao verificar revogação: %s\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1420
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura válida? (s/N/q)"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1424
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inválida? (s/N/q)"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1428
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1434
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1448
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1449
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1452
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selecções das chaves secretas.\n"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1527
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor seleccione no máximo uma chave secundária.\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1531
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "A modificar a data de validade para uma chave secundária.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave primária.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1575
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Você não pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1591
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1652
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1698
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secundária com índice %d\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1796
 msgid "user ID: \""
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1799
 #, c-format
 msgid ""
 "\"\n"
@@ -2535,185 +2555,236 @@
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1803
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1827
 msgid "You have signed these user IDs:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1846
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1866
 msgid "You are about to revoke these signatures:\n"
 msgstr "Está prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1884
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Realmente gerar os certificados de revogação? (s/N)"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1913
 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:400 g10/mainproc.c:790
-#, fuzzy, c-format
+#: g10/keylist.c:279 g10/mainproc.c:851
+#, c-format
 msgid " [expires: %s]"
-msgstr "A chave expira em %s\n"
+msgstr "[expira: %s]"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:269
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "a chave pública é %08lX\n"
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:314
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados encriptados com chave pública: DEK válido\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:366
 #, 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:336
+#: g10/mainproc.c:376
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "encriptado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr "nenhuma chave secreta para desencriptação disponível\n"
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:390
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "desencriptação de chave pública falhou: %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:430
 msgid "decryption okay\n"
 msgstr "desencriptação correcta\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:435
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem encriptada foi manipulada!\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:440
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "desencriptação falhou: %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:459
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:461
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:632
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocação solitária - utilize \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:719 g10/mainproc.c:728
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de notação inválidos encontrados\n"
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:731
 msgid "Notation: "
 msgstr "Notação: "
 
-#: g10/mainproc.c:680
+#: g10/mainproc.c:740
 msgid "Policy: "
 msgstr "Política: "
 
-#: g10/mainproc.c:1121
+#: g10/mainproc.c:1193
 msgid "signature verification suppressed\n"
 msgstr "verificação de assinatura suprimida\n"
 
-#: g10/mainproc.c:1158
+#. plaintext before signatures but no one-pass packets
+#: g10/mainproc.c:1235 g10/mainproc.c:1245
+msgid "can't handle these multiple signatures\n"
+msgstr "não consigo tratar estas assinaturas múltiplas\n"
+
+#: g10/mainproc.c:1256
 #, 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:1184 g10/mainproc.c:1195
+#: g10/mainproc.c:1284 g10/mainproc.c:1292
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1196
+#: g10/mainproc.c:1285 g10/mainproc.c:1293
 msgid "Good signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1243
+#: g10/mainproc.c:1358
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossível verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1318
+#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+msgid "not a detached signature\n"
+msgstr "não é uma assinatura separada\n"
+
+#: g10/mainproc.c:1454
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1511
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1518
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inválido detectado em proc_tree()\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossível desactivar core dumps: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Algoritmos experimentais não devem ser usados!\n"
 
-#: g10/misc.c:234
-msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
+#: g10/misc.c:238
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
-"este algoritmo de criptografia não é recomendado;\n"
-"por favor use um algoritmo mais standard!\n"
+"este algoritmo de criptografia está desctualizado; por favor use um "
+"algoritmo mais standard!x\n"
 
 #: g10/parse-packet.c:119
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossível manipular algoritmo de chave pública %d\n"
 
-#: g10/parse-packet.c:991
+#: g10/parse-packet.c:1010
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit crítico ligado\n"
 
-#: g10/passphrase.c:159
+#: g10/passphrase.c:223
+msgid "gpg-agent is not available in this session\n"
+msgstr "o gpg-agent não está disponível nesta sessão\n"
+
+#: g10/passphrase.c:229
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "variável de ambiente GPG_AGENT_INFO inválida\n"
+
+#: g10/hkp.c:167 g10/passphrase.c:248
+#, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "impossível ligar a `%s': %s\n"
+
+#: g10/passphrase.c:313 g10/passphrase.c:576
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr " (ID principal da chave %08lX)"
+
+#: g10/passphrase.c:323
+#, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"Precisa de uma frase secreta para desbloquear a chave secreta do "
+"utilizador:\n"
+"\n"
+"\"%.*s\"\n"
+"chave %u bits %s, ID %08lx, criada %s%s\n"
+
+#: g10/passphrase.c:344
+msgid "Enter passphrase\n"
+msgstr "Insira a frase secreta\n"
+
+#: g10/passphrase.c:346
+msgid "Repeat passphrase\n"
+msgstr "Repita a frase secreta\n"
+
+#: g10/passphrase.c:384
+msgid "passphrase too long\n"
+msgstr "frase secreta demasiado longa\n"
+
+#: g10/passphrase.c:396
+msgid "invalid response from agent\n"
+msgstr "resposta do agente inválida\n"
+
+#: g10/passphrase.c:405
+msgid "cancelled by user\n"
+msgstr "cancelado pelo utilizador\n"
+
+#: g10/passphrase.c:408 g10/passphrase.c:477
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr "problema com o agente: o agente returnou 0x%lx\n"
+
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2723,25 +2794,20 @@
 "Você precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "utilizador: \""
 
-#: g10/passphrase.c:168
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:173
-#, c-format
-msgid " (main key ID %08lX)"
-msgstr " (ID principal da chave %08lX)"
-
-#: g10/passphrase.c:190
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
 msgstr "impossível pedir senha em modo não-interactivo\n"
 
-#: g10/passphrase.c:194
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:198
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
@@ -2749,19 +2815,23 @@
 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:324
+#: g10/plaintext.c:332
 msgid "Detached signature.\n"
 msgstr "Assinatura desacoplada.\n"
 
-#: g10/plaintext.c:328
+#: g10/plaintext.c:336
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do ficheiro de dados: "
 
-#: g10/plaintext.c:349
+#: g10/plaintext.c:357
 msgid "reading stdin ...\n"
 msgstr "lendo do \"stdin\" ...\n"
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:391
+msgid "no signed data\n"
+msgstr "não há dados assinados\n"
+
+#: g10/plaintext.c:399
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossível abrir dados assinados `%s'\n"
@@ -2780,9 +2850,9 @@
 msgstr "codificação antiga do DEK não suportada\n"
 
 #: g10/pubkey-enc.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
-msgstr "algoritmo de protecção %d não é suportado\n"
+msgstr "algoritmo de cifra %d é desconhecido ou foi desactivado\n"
 
 #: g10/pubkey-enc.c:192
 #, c-format
@@ -2790,53 +2860,47 @@
 msgstr "NOTA: algoritmo de cifragem %d não encontrado nas preferências\n"
 
 #: g10/pubkey-enc.c:198
-#, fuzzy, c-format
+#, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
-msgstr "NOTA: chave de assinatura expirou %s\n"
+msgstr "NOTA: chave secreta %08lX expirou em %s\n"
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
-msgstr ""
+msgstr "a pedir chave %08lX de %s ...\n"
 
-#: g10/hkp.c:85
-#, fuzzy, c-format
+#: g10/hkp.c:83
+#, c-format
 msgid "can't get key from keyserver: %s\n"
-msgstr "importar chaves de um servidor"
+msgstr "não consigo obterr chave do servidor: %s\n"
 
-#: g10/hkp.c:109 g10/hkp.c:148
+#: g10/hkp.c:102 g10/hkp.c:136
 msgid "no keyserver known (use option --keyserver)\n"
-msgstr ""
+msgstr "nenhum servidor de chaves conhecido (utilize a opção --keyserver)\n"
 
-#: g10/hkp.c:117
-#, fuzzy, c-format
+#: g10/hkp.c:110
+#, c-format
 msgid "%s: not a valid key ID\n"
-msgstr "%s não é um conjunto de caracteres válido\n"
-
-#: g10/hkp.c:170
-#, fuzzy, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "impossível abrir `%s': %s\n"
+msgstr "%s: não é um identificador de chave válido\n"
 
-#: g10/hkp.c:194
-#, fuzzy, c-format
+#: g10/hkp.c:191
+#, c-format
 msgid "error sending to `%s': %s\n"
-msgstr "erro na leitura de `%s': %s\n"
+msgstr "erro ao enviar para `%s': %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:203
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
-msgstr ""
+msgstr "sucesso ao enviar para `%s' (estado=%u)\n"
 
-#: g10/hkp.c:209
+#: g10/hkp.c:206
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
-msgstr ""
+msgstr "erro ao enviar para `%s': estado=%u\n"
 
 #: g10/seckey-cert.c:53
-#, fuzzy
 msgid "secret key parts are not available\n"
-msgstr "chave secreta não disponível"
+msgstr "partes da chave secreta não disponíveis\n"
 
 #: g10/seckey-cert.c:59
 #, c-format
@@ -2872,30 +2936,35 @@
 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:324
+#: g10/sig-check.c:328
 #, c-format
-msgid "NOTE: signature key expired %s\n"
-msgstr "NOTA: chave de assinatura expirou %s\n"
+msgid "NOTE: signature key %08lX expired %s\n"
+msgstr "NOTA: chave de assinatura %08lx expirou %s\n"
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "assumindo assinatura incorrecta devido a um bit crítico desconhecido\n"
 
-#: g10/sign.c:140
+#: g10/sign.c:152
+#, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "verificação da assinatura criada falhou: %s\n"
+
+#: g10/sign.c:161
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:307 g10/sign.c:630
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossível criar %s: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:405
 msgid "signing:"
 msgstr "a assinar:"
 
-#: g10/sign.c:431
+#: g10/sign.c:448
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' é um ficheiro vazio\n"
@@ -2934,7 +3003,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diretoria inexistente!\n"
 
-#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
+#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: impossível criar: %s\n"
@@ -2967,7 +3036,7 @@
 #: g10/tdbio.c:550
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
-msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
+msgstr "%s: falha ao criar tabela de dispersão: %s\n"
 
 #: g10/tdbio.c:558
 #, c-format
@@ -3082,9 +3151,9 @@
 msgstr "get_dir_record: search_record falhou: %s\n"
 
 #: g10/trustdb.c:474
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid long keyID\n"
-msgstr "%s não é um conjunto de caracteres válido\n"
+msgstr "'%s' não é um identificador de chave longo válido\n"
 
 #: g10/trustdb.c:501
 #, c-format
@@ -3107,20 +3176,17 @@
 msgstr "chave %08lX: aceite como chave confiável.\n"
 
 #: g10/trustdb.c:546
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
-msgstr "chave %08lX: não é uma chave rfc2440 - ignorada\n"
+msgstr ""
+"chave %08lX: nenhuma chave pública para chave de confiança - ignorada\n"
+"\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"
@@ -3331,7 +3397,7 @@
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "AVISO: ainda é impossível manipular registos de preferências longos\n"
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -3341,7 +3407,7 @@
 "Não se esqueça que o ficheiro com a assinatura (.sig ou .asc)\n"
 "deve ser o primeiro a ser dado na linha de comando.\n"
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linha de entrada %u demasiado longa ou falta o LF\n"
@@ -3351,40 +3417,49 @@
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: impossível criar porta-chaves: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1374
+#: g10/ringedit.c:319 g10/ringedit.c:1376
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porta-chaves criado\n"
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1557
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 ficheiros com informações confidenciais.\n"
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1558
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s é o não modificado\n"
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1559
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s é o novo\n"
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1560
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte esta possível falha de segurança\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "a chave não está marcada insegura - impossível usá-la com o RNG falso!\n"
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "ignorado `%s': duplicada\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+msgid "skipped: secret key already present\n"
+msgstr "ignorado: a chave secreta já está presente\n"
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3412,31 +3487,31 @@
 msgid "Enter new filename"
 msgstr "Digite novo nome de ficheiro"
 
-#: g10/openfile.c:182
+#: g10/openfile.c:184
 msgid "writing to stdout\n"
 msgstr "a escrever em \"stdout\"\n"
 
-#: g10/openfile.c:261
+#: g10/openfile.c:273
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "a assumir dados assinados em `%s'\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:323
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: novo ficheiro de opções criado\n"
 
-#: g10/openfile.c:338
+#: g10/openfile.c:350
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: g10/openfile.c:341
+#: g10/openfile.c:353
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: directoria criada\n"
 
-#: g10/openfile.c:343
+#: g10/openfile.c:355
 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"
 
@@ -3457,6 +3532,10 @@
 "AVISO: A mensagem foi encriptada com uma chave fraca na criptografia\n"
 "simétrica.\n"
 
+#: g10/encr-data.c:97
+msgid "problem handling encrypted packet\n"
+msgstr "problema ao tratar pacote encriptado\n"
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "chave fraca criada - tentando novamente\n"
@@ -3468,14 +3547,6 @@
 "impossível evitar chave fraca para criptografia simétrica;\n"
 "tentei %d vezes!\n"
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "há uma chave secreta para esta chave pública!\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr "utilize a opção \"--delete-secret-key\" para a apagar primeiro.\n"
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "impossível fazer isso em modo não-interactivo sem utilizar \"--yes\"\n"
@@ -3488,6 +3559,14 @@
 msgid "This is a secret key! - really delete? "
 msgstr "Esta chave é secreta! - apagar de qualquer modo? "
 
+#: g10/delkey.c:181
+msgid "there is a secret key for this public key!\n"
+msgstr "há uma chave secreta para esta chave pública!\n"
+
+#: g10/delkey.c:183
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr "utilize a opção \"--delete-secret-key\" para a apagar primeiro.\n"
+
 #: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
@@ -3606,7 +3685,7 @@
 msgstr ""
 "N  para mudar o nome.\n"
 "C  para mudar o comentário.\n"
-"E  para mudar o endereço de correio eletrônico.\n"
+"E  para mudar o endereço de email\n"
 "O  para continuar a geração da chave.\n"
 "S  para interromper a geração da chave."
 
@@ -3675,7 +3754,7 @@
 msgid ""
 "Please enter the passhrase; this is a secret sentence \n"
 "  Blurb, blurb,.... "
-msgstr "Por favor digite a FRASE secreta"
+msgstr "Por favor digite a frase secreta"
 
 #: g10/helptext.c:209
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
@@ -3713,6 +3792,19 @@
 "      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"
 msgstr ""
+"Deve especificar uma razão para a emissão do certificado. Dependendo no\n"
+"contexto, pode escolher as seguintes opções desta lista:\n"
+"  \"A chave foi comprometida\"\n"
+"     Utilize esta opção se tem razões para acreditar que indivíduos não\n"
+"     autorizados obtiveram acesso à sua chave secreta.\n"
+"  \"A chave foi substituida\"\n"
+"     Utilize esta opção se substituiu esta chave com uma mais recente.\n"
+"  \"A chave já não é utilizada\"\n"
+"     Utilize esta opção se já não utiliza a chave.\n"
+"  \"O identificador do utilizador já não é válido\"\n"
+"     Utilize esta opção para comunicar que o identificador do utilizador\n"
+"     não deve ser mais utilizado; normalmente utilizada para indicar\n"
+"     que um endereço de email é inválido.\n"
 
 #: g10/helptext.c:245
 msgid ""
@@ -3720,6 +3812,9 @@
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
+"Se desejar, pode inserir uma texto descrevendo a razão pela qual criou\n"
+"este certificado de revogação. Por favor mantenha este texto conciso.\n"
+"Uma linha vazia termina o texto.\n"
 
 #: g10/helptext.c:260
 msgid "No help available"
@@ -3729,31 +3824,3 @@
 #, 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"
-
-#~ msgid "enable full debugging"
-#~ msgstr "habilitar depuração completa"
-
-#~ msgid "do not write comment packets"
-#~ msgstr "não escrever pacotes de comentário"
-
-#~ msgid "(default is 1)"
-#~ msgstr "(por omissão 1)"
-
-#~ msgid "(default is 3)"
-#~ msgstr "(por omissão 3)"
-
-#~ msgid "   (%d) ElGamal in a v3 packet\n"
-#~ msgstr "   (%d) ElGamal num pacote v3\n"
-
-#~ msgid "Key generation can only be used in interactive mode\n"
-#~ msgstr "A geração de chaves só pode ser feita em modo interactivo\n"
diff -urN gnupg-1.0.4/po/ru.po gnupg-1.0.5/po/ru.po
--- gnupg-1.0.4/po/ru.po	Tue Oct 17 15:40:41 2000
+++ gnupg-1.0.5/po/ru.po	Sun Apr 29 16:39:31 2001
@@ -9,7 +9,7 @@
 # QingLong <qinglong@Bolizm> (couldn't send an email to let you know)
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-10-16 19:22+0200\n"
+"POT-Creation-Date: 2001-04-29 16:39+0200\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-01-26 22:08:36+0100\n"
 "From: Gregory Steuck <steuck@iname.com>\n"
@@ -28,35 +28,35 @@
 "üÔÕ ÐÒÏÂÌÅÍÕ ÍÏÖÎÏ ÒÅÛÉÔØ, ÕÓÔÁÎÏ×É× ÐÒÏÇÒÁÍÍÕ suid(root).\n"
 "ïÂÒÁÔÉÔÅÓØ ÄÌÑ ÜÔÏÇÏ Ë ÁÄÍÉÎÉÓÔÒÁÔÏÒÕ ÷ÁÛÅÊ ÓÉÓÔÅÍÙ.\n"
 
-#: util/secmem.c:295
+#: util/secmem.c:299
 msgid "operation is not possible without initialized secure memory\n"
 msgstr ""
 
-#: util/secmem.c:296
+#: util/secmem.c:300
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:287 util/miscutil.c:316
 msgid "yes"
 msgstr "ÄÁ(y)"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:288 util/miscutil.c:319
 msgid "yY"
 msgstr "yY"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:289 util/miscutil.c:317
 msgid "no"
 msgstr ""
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:290 util/miscutil.c:320
 msgid "nN"
 msgstr ""
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:318
 msgid "quit"
 msgstr "×ÙÈÏÄ"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:321
 msgid "qQ"
 msgstr ""
 
@@ -303,6 +303,17 @@
 msgid "not processed"
 msgstr "îÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "ðÌÏÈÏÊ ÏÔËÒÙÔÙÊ ËÌÀÞ"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "ðÌÏÈÏÊ ÓÅËÒÅÔÎÙÊ ËÌÀÞ"
+
 #: util/logger.c:224
 #, fuzzy, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -313,64 +324,64 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "÷Ù ÎÁÛÌÉ ÏÛÉÂËÕ × ÐÒÏÇÒÁÍÍÅ ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
 #, fuzzy, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:324
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:329
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:325
+#: cipher/random.c:334
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:331
+#: cipher/random.c:340
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:339
+#: cipher/random.c:348
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:386
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:397
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:413
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:416
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:427
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:650
+#: cipher/random.c:661
 #, fuzzy
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "÷ÎÉÍÁÎÉÅ: ÉÓÐÏÌØÚÕÅÔÓÑ ÎÅÎÁÄÅÖÎÙÊ ÇÅÎÅÒÁÔÏÒ ÓÌÕÞÁÊÎÙÈ ÞÉÓÅÌ!\n"
 
-#: cipher/random.c:651
+#: cipher/random.c:662
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -395,7 +406,7 @@
 "îÅÄÏÓÔÁÔÏÞÎÏ ÓÌÕÞÁÊÎÙÈ ÄÁÎÎÙÈ. ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÅÌÁÊÔÅ ÞÔÏ-ÎÉÂÕÄØ, ÞÔÏÂÙ\n"
 "ïó ÍÏÇÌÁ ÎÁÂÒÁÔØ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÓÌÕÞÁÊÎÙÅ ÞÉÓÌÁ! (ÎÕÖÎÏ ÅÝÅ %d ÂÁÊÔ)\n"
 
-#: g10/g10.c:206
+#: g10/g10.c:216
 msgid ""
 "@Commands:\n"
 " "
@@ -403,147 +414,147 @@
 "@ëÏÍÁÎÄÙ:\n"
 " "
 
-#: g10/g10.c:208
+#: g10/g10.c:218
 #, fuzzy
 msgid "|[file]|make a signature"
 msgstr "|[ÆÁÊÌ]|ÓÏÚÄÁÔØ ÐÏÄÐÉÓØ"
 
-#: g10/g10.c:209
+#: g10/g10.c:219
 #, fuzzy
 msgid "|[file]|make a clear text signature"
 msgstr "|[ÆÁÊÌ]|ÓÏÚÄÁÔØ ÔÅËÓÔÏ×ÕÀ ÐÏÄÐÉÓØ"
 
-#: g10/g10.c:210
+#: g10/g10.c:220
 msgid "make a detached signature"
 msgstr "ÓÏÚÄÁÔØ ÏÔÄÅÌØÎÕÀ ÐÏÄÐÉÓØ"
 
-#: g10/g10.c:211
+#: g10/g10.c:221
 msgid "encrypt data"
 msgstr "ÚÁÛÉÆÒÏ×ÁÔØ ÄÁÎÎÙÅ"
 
-#: g10/g10.c:212
+#: g10/g10.c:222
 msgid "encryption only with symmetric cipher"
 msgstr "ÚÁÛÉÆÒÏ×ÁÔØ ÓÉÍÍÅÔÒÉÞÎÙÍ ÁÌÇÏÒÉÔÍÏÍ"
 
-#: g10/g10.c:213
+#: g10/g10.c:223
 msgid "store only"
 msgstr "ÔÏÌØËÏ ÓÏÈÒÁÎÉÔØ"
 
-#: g10/g10.c:214
+#: g10/g10.c:224
 msgid "decrypt data (default)"
 msgstr "ÒÁÓÛÉÆÒÏ×ÁÔØ ÄÁÎÎÙÅ (ÐÏ ÕÍÏÌÞÁÎÉÀ)"
 
-#: g10/g10.c:215
+#: g10/g10.c:225
 msgid "verify a signature"
 msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ"
 
-#: g10/g10.c:217
+#: g10/g10.c:227
 msgid "list keys"
 msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ"
 
-#: g10/g10.c:219
+#: g10/g10.c:229
 msgid "list keys and signatures"
 msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ É ÐÏÄÐÉÓÅÊ"
 
-#: g10/g10.c:220
+#: g10/g10.c:230
 msgid "check key signatures"
 msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ ÎÁ ËÌÀÞÅ"
 
-#: g10/g10.c:221
+#: g10/g10.c:231
 msgid "list keys and fingerprints"
 msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ Ó ÉÈ \"ÏÔÐÅÞÁÔËÁÍÉ ÐÁÌØÃÅ×\""
 
-#: g10/g10.c:222
+#: g10/g10.c:232
 msgid "list secret keys"
 msgstr "ÓÐÉÓÏË ÓÅËÒÅÔÎÙÈ ËÌÀÞÅÊ"
 
-#: g10/g10.c:223
+#: g10/g10.c:233
 msgid "generate a new key pair"
 msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÎÏ×ÕÀ ÐÁÒÕ ËÌÀÞÅÊ (ÏÔËÒÙÔÙÊ É ÓÅËÒÅÔÎÙÊ)"
 
-#: g10/g10.c:224
+#: g10/g10.c:234
 msgid "remove key from the public keyring"
 msgstr "ÕÄÁÌÉÔØ ËÌÀÞ ÓÏ Ó×ÑÚËÉ"
 
-#: g10/g10.c:226
+#: g10/g10.c:236
 #, fuzzy
 msgid "remove key from the secret keyring"
 msgstr "ÕÄÁÌÉÔØ ËÌÀÞ ÓÏ Ó×ÑÚËÉ"
 
-#: g10/g10.c:227
+#: g10/g10.c:237
 #, fuzzy
 msgid "sign a key"
 msgstr "ÐÏÄÐÉÓÁÔØ ËÌÀÞ"
 
-#: g10/g10.c:228
+#: g10/g10.c:238
 #, fuzzy
 msgid "sign a key locally"
 msgstr "ÐÏÄÐÉÓÁÔØ ËÌÀÞ"
 
-#: g10/g10.c:229
+#: g10/g10.c:239
 msgid "sign or edit a key"
 msgstr "ÐÏÄÐÉÓÁÔØ ÉÌÉ ÒÅÄÁËÔÉÒÏ×ÁÔØ ËÌÀÞ"
 
-#: g10/g10.c:230
+#: g10/g10.c:240
 msgid "generate a revocation certificate"
 msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ"
 
-#: g10/g10.c:231
+#: g10/g10.c:241
 msgid "export keys"
 msgstr "ÜËÓÐÏÒÔÉÒÏ×ÁÔØ ËÌÀÞÉ"
 
-#: g10/g10.c:232
+#: g10/g10.c:242
 msgid "export keys to a key server"
 msgstr ""
 
-#: g10/g10.c:233
+#: g10/g10.c:243
 msgid "import keys from a key server"
 msgstr ""
 
-#: g10/g10.c:237
+#: g10/g10.c:247
 msgid "import/merge keys"
 msgstr "ÉÍÐÏÒÔÉÒÏ×ÁÔØ/ÄÏÂÁ×ÉÔØ ËÌÀÞÉ"
 
-#: g10/g10.c:239
+#: g10/g10.c:249
 msgid "list only the sequence of packets"
 msgstr "ÎÁÐÅÞÁÔÁÔØ ÔÏÌØËÏ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ÐÁËÅÔÏ×"
 
-#: g10/g10.c:241
+#: g10/g10.c:251
 #, fuzzy
 msgid "export the ownertrust values"
 msgstr "ÜËÓÐÏÒÔÉÒÏ×ÁÔØ ÐÁÒÁÍÅÔÒÙ ÄÏ×ÅÒÉÑ\n"
 
-#: g10/g10.c:243
+#: g10/g10.c:253
 #, fuzzy
 msgid "import ownertrust values"
 msgstr "ÉÍÐÏÒÔÉÒÏ×ÁÔØ ÐÁÒÁÍÅÔÒÙ ÄÏ×ÅÒÉÑ\n"
 
-#: g10/g10.c:245
+#: g10/g10.c:255
 #, fuzzy
 msgid "update the trust database"
 msgstr "|[éíåîá]|ÐÒÏ×ÅÒÉÔØ ÂÁÚÕ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ"
 
-#: g10/g10.c:247
+#: g10/g10.c:257
 msgid "|[NAMES]|check the trust database"
 msgstr "|[éíåîá]|ÐÒÏ×ÅÒÉÔØ ÂÁÚÕ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ"
 
-#: g10/g10.c:248
+#: g10/g10.c:258
 msgid "fix a corrupted trust database"
 msgstr "ÉÓÐÒÁ×ÉÔØ ÒÁÚÒÕÛÅÎÎÕÀ ÂÁÚÕ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ"
 
-#: g10/g10.c:249
+#: g10/g10.c:259
 msgid "De-Armor a file or stdin"
 msgstr "äÅËÏÄÉÒÏ×ÁÔØ stdin ÉÌÉ ÆÁÊÌ ÉÚ ASCII-ÐÒÅÄÓÔÁ×ÌÅÎÉÑ"
 
-#: g10/g10.c:251
+#: g10/g10.c:261
 msgid "En-Armor a file or stdin"
 msgstr "úÁËÏÄÉÒÏ×ÁÔØ stdin ÉÌÉ ÆÁÊÌ × ASCII-ÐÒÅÄÓÔÁ×ÌÅÎÉÅ"
 
-#: g10/g10.c:253
+#: g10/g10.c:263
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|ÎÁÐÅÞÁÔÁÔØ ÄÁÊÄÖÅÓÔ ÓÏÏÂÝÅÎÉÑ"
 
-#: g10/g10.c:257
+#: g10/g10.c:267
 msgid ""
 "@\n"
 "Options:\n"
@@ -553,168 +564,172 @@
 "ðÁÒÁÍÅÔÒÙ:\n"
 " "
 
-#: g10/g10.c:259
+#: g10/g10.c:269
 msgid "create ascii armored output"
 msgstr "×Ù×ÏÄ × ASCII-ÐÒÅÄÓÔÁ×ÌÅÎÉÉ"
 
-#: g10/g10.c:261
+#: g10/g10.c:271
 #, fuzzy
 msgid "|NAME|encrypt for NAME"
 msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍÏÍ éíñ"
 
-#: g10/g10.c:264
+#: g10/g10.c:274
 #, fuzzy
 msgid "|NAME|use NAME as default recipient"
 msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ éíñ × ËÁÞÅÓÔ×Å ÓÅËÒÅÔÎÏÇÏ ËÌÀÞÁ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: g10/g10.c:266
+#: g10/g10.c:276
 msgid "use the default key as default recipient"
 msgstr ""
 
-#: g10/g10.c:270
+#: g10/g10.c:280
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "ÉÓÐÏÌØÚÏ×ÁÔØ ÕËÁÚÁÎÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÐÏÄÐÉÓÉ ÉÌÉ ÒÁÓÛÉÆÒÏ×ËÉ"
 
-#: g10/g10.c:271
+#: g10/g10.c:281
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|ÕÓÔÁÎÏ×ÉÔØ ÕÒÏ×ÅÎØ ÓÖÁÔÉÑ (0 - ÎÅ ÓÖÉÍÁÔØ)"
 
-#: g10/g10.c:273
+#: g10/g10.c:283
 msgid "use canonical text mode"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ËÁÎÏÎÉÞÅÓËÉÊ ÔÅËÓÔÏ×ÙÊ ÒÅÖÉÍ"
 
-#: g10/g10.c:274
+#: g10/g10.c:284
 msgid "use as output file"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ × ËÁÞÅÓÔ×Å ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ"
 
-#: g10/g10.c:275
+#: g10/g10.c:285
 msgid "verbose"
 msgstr "ÍÎÏÇÏÓÌÏ×ÎÙÊ"
 
-#: g10/g10.c:276
+#: g10/g10.c:286
 msgid "be somewhat more quiet"
 msgstr ""
 
-#: g10/g10.c:277
+#: g10/g10.c:287
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: g10/g10.c:278
+#: g10/g10.c:288
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ ÎÁ ËÌÀÞÅ"
 
-#: g10/g10.c:279
+#: g10/g10.c:289
 #, fuzzy
 msgid "always use a MDC for encryption"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ÕËÁÚÁÎÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÛÉÆÒÏ×ÁÎÉÑ"
 
-#: g10/g10.c:280
+#: g10/g10.c:290
 msgid "do not make any changes"
 msgstr "Keine wirklichen Änderungen durchführen"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:282
+#: g10/g10.c:292
+msgid "use the gpg-agent"
+msgstr ""
+
+#: g10/g10.c:293
 msgid "batch mode: never ask"
 msgstr "ÐÁËÅÔÎÙÊ ÒÅÖÉÍ: ÎÉÞÅÇÏ ÎÅ ÓÐÒÁÛÉ×ÁÔØ"
 
-#: g10/g10.c:283
+#: g10/g10.c:294
 msgid "assume yes on most questions"
 msgstr "ÏÔ×ÅÞÁÔØ \"ÄÁ\" ÎÁ ÂÏÌØÛÉÎÓÔ×Ï ×ÏÐÒÏÓÏ×"
 
-#: g10/g10.c:284
+#: g10/g10.c:295
 msgid "assume no on most questions"
 msgstr "ÏÔ×ÅÞÁÔØ \"ÎÅÔ\" ÎÁ ÂÏÌØÛÉÎÓÔ×Ï ×ÏÐÒÏÓÏ×"
 
-#: g10/g10.c:285
+#: g10/g10.c:296
 msgid "add this keyring to the list of keyrings"
 msgstr "ÄÏÂÁ×ÉÔØ ÜÔÕ Ó×ÑÚËÕ Ë ÓÐÉÓËÕ Ó×ÑÚÏË ËÌÀÞÅÊ"
 
-#: g10/g10.c:286
+#: g10/g10.c:297
 msgid "add this secret keyring to the list"
 msgstr "ÄÏÂÁ×ÉÔØ ÜÔÕ ÓÅËÒÅÔÎÕÀ Ó×ÑÚËÕ Ë ÓÐÉÓËÕ Ó×ÑÚÏË ËÌÀÞÅÊ"
 
-#: g10/g10.c:287
+#: g10/g10.c:298
 msgid "|NAME|use NAME as default secret key"
 msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ éíñ × ËÁÞÅÓÔ×Å ÓÅËÒÅÔÎÏÇÏ ËÌÀÞÁ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: g10/g10.c:288
+#: g10/g10.c:299
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: g10/g10.c:289
+#: g10/g10.c:300
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍÏÍ éíñ"
 
-#: g10/g10.c:290
+#: g10/g10.c:301
 msgid "read options from file"
 msgstr "ÞÉÔÁÔØ ÐÁÒÁÍÅÔÒÙ ÉÚ ÆÁÊÌÁ"
 
-#: g10/g10.c:294
+#: g10/g10.c:305
 msgid "|FD|write status info to this FD"
 msgstr "|FD| ÚÁÐÉÓÙ×ÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ÓÏÓÔÏÑÎÉÉ × ÄÅÓËÒÉÐÔÏÒ (FD)"
 
-#: g10/g10.c:299
+#: g10/g10.c:310
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:300
+#: g10/g10.c:311
 #, fuzzy
 msgid "|FILE|load extension module FILE"
 msgstr "|æáêì|ÚÁÇÒÕÚÉÔØ æáêì Ó ÒÁÓÛÉÒÑÀÝÉÍÉ ÍÏÄÕÌÑÍÉ"
 
-#: g10/g10.c:301
+#: g10/g10.c:312
 msgid "emulate the mode described in RFC1991"
 msgstr "ÜÍÕÌÉÒÏ×ÁÔØ ÒÅÖÉÍ ÏÐÉÓÁÎÎÙÊ × RFC1991"
 
-#: g10/g10.c:302
+#: g10/g10.c:313
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:303
+#: g10/g10.c:314
 #, fuzzy
 msgid "|N|use passphrase mode N"
 msgstr "|N|ÉÓÐÏÌØÚÏ×ÁÔØ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ ÒÅÖÉÍÁ N\n"
 
-#: g10/g10.c:305
+#: g10/g10.c:316
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÈÜÛ-ÁÌÇÏÒÉÔÍ éíñ ÄÌÑ ËÌÀÞÅ×ÙÈ ÆÒÁÚ"
 
-#: g10/g10.c:307
+#: g10/g10.c:318
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍÏÍ éíñ ÄÌÑ ËÌÀÞÅ×ÙÈ ÆÒÁÚ"
 
-#: g10/g10.c:308
+#: g10/g10.c:319
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍÏÍ éíñ"
 
-#: g10/g10.c:309
+#: g10/g10.c:320
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÈÜÛ-ÁÌÇÏÒÉÔÍ éíñ"
 
-#: g10/g10.c:310
+#: g10/g10.c:321
 msgid "|N|use compress algorithm N"
 msgstr "|N|ÉÓÐÏÌØÚÏ×ÁÔØ ÁÌÇÏÒÉÔÍ ÓÖÁÔÉÑ N"
 
-#: g10/g10.c:311
+#: g10/g10.c:322
 msgid "throw keyid field of encrypted packets"
 msgstr "×ÙÂÒÁÓÙ×ÁÔØ ÐÏÌÅ keyid Õ ÚÁÛÉÆÒÏ×ÁÎÎÙÈ ÐÁËÅÔÏ×"
 
-#: g10/g10.c:312
+#: g10/g10.c:323
 msgid "|NAME=VALUE|use this notation data"
 msgstr ""
 
-#: g10/g10.c:315
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:318
+#: g10/g10.c:329
 #, fuzzy
 msgid ""
 "@\n"
@@ -735,17 +750,17 @@
 " --list-keys [names]        ÐÏËÁÚÁÔØ ÓÐÉÓÏË ËÌÀÞÅÊ\n"
 " --fingerprint [names]      ÐÏËÁÚÁÔØ \"ÏÔÐÅÞÁÔËÉ ÐÁÌØÃÅ×\" ËÌÀÞÅÊ\n"
 
-#: g10/g10.c:418
+#: g10/g10.c:438
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "ðÏÖÁÌÕÊÓÔÁ, ÏÔÐÒÁ×ÌÑÊÔÅ ÓÏÏÂÝÅÎÉÑ Ï ÏÛÉÂËÁÈ ÐÏ ÁÄÒÅÓÕ "
 "<gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:422
+#: g10/g10.c:442
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: gpg [ÐÁÒÁÍÅÔÒÙ] [ÆÁÊÌÙ] (-h ÄÌÑ ÐÏÍÏÝÉ)"
 
-#: g10/g10.c:425
+#: g10/g10.c:445
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -755,7 +770,7 @@
 "ÐÏÄÐÉÓÙ×ÁÅÔ, ÐÒÏ×ÅÒÑÅÔ ÐÏÄÐÉÓÉ, ÛÉÆÒÕÅÔ ÉÌÉ ÒÁÓÛÉÆÒÏ×Ù×ÁÅÔ\n"
 "ÒÅÖÉÍ ÒÁÂÏÔÙ ÚÁ×ÉÓÉÔ ÏÔ ×ÈÏÄÎÙÈ ÄÁÎÎÙÈ\n"
 
-#: g10/g10.c:432
+#: g10/g10.c:452
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -763,289 +778,294 @@
 "\n"
 "ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÁÌÇÏÒÉÔÍÙ:\n"
 
-#: g10/g10.c:511
+#: g10/g10.c:531
 msgid "usage: gpg [options] "
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: gpg [ÐÁÒÁÍÅÔÒÙ] "
 
-#: g10/g10.c:564
+#: g10/g10.c:584
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Kommandos\n"
 
-#: g10/g10.c:704
+#: g10/g10.c:734
 #, fuzzy, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ÚÁÍÅÞÁÎÉÅ: ÆÁÊÌ ÐÁÒÁÍÅÔÒÏ× ÐÏ ÕÍÏÌÞÁÎÉÀ `%s' ÏÔÓÕÔÓÔ×ÕÅÔ\n"
 
-#: g10/g10.c:708
+#: g10/g10.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ÆÁÊÌ ÐÁÒÁÍÅÔÒÏ× `%s': %s\n"
 
-#: g10/g10.c:715
+#: g10/g10.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "ÞÉÔÁÀÔÓÑ ÐÁÒÁÍÅÔÒÙ ÉÚ `%s'\n"
 
-#: g10/g10.c:905
+#: g10/g10.c:950
 #, fuzzy, c-format
 msgid "%s is not a valid character set\n"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ËÏÍÍÅÎÔÁÒÉÉ.\n"
 
-#: g10/g10.c:970
+#: g10/g10.c:1024
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:974 g10/g10.c:983
+#: g10/g10.c:1028 g10/g10.c:1037
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/g10.c:976
+#: g10/g10.c:1030
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr ""
 
-#: g10/g10.c:979
+#: g10/g10.c:1033
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr ""
 
-#: g10/g10.c:998 g10/g10.c:1010
+#: g10/g10.c:1053 g10/g10.c:1065
 msgid "selected cipher algorithm is invalid\n"
 msgstr "×ÙÂÒÁÎ ÎÅÄÏÐÕÓÔÉÍÙÊ ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ\n"
 
-#: g10/g10.c:1004 g10/g10.c:1016
+#: g10/g10.c:1059 g10/g10.c:1071
 msgid "selected digest algorithm is invalid\n"
 msgstr "×ÙÂÒÁÎ ÎÅÄÏÐÕÓÔÉÍÙÊ ÄÁÊÄÖÅÓÔ-ÁÌÇÏÒÉÔÍ\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1075
 msgid "the given policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:1023
+#: g10/g10.c:1078
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "ÁÌÇÏÒÉÔÍ ÕÐÁËÏ×ËÉ ÍÏÖÅÔ ÉÍÅÔØ ÚÎÁÞÅÎÉÑ ÏÔ %d ÄÏ %d\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1080
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ÄÏÌÖÅÎ ÂÙÔØ ÂÏÌØÛÅ 0\n"
 
-#: g10/g10.c:1027
+#: g10/g10.c:1082
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ÄÏÌÖÅÎ ÂÙÔØ ÂÏÌØÛÅ 1\n"
 
-#: g10/g10.c:1029
+#: g10/g10.c:1084
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:1032
+#: g10/g10.c:1087
 #, fuzzy
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ÚÁÍÅÞÁÎÉÅ: ÐÒÏÓÔÏÊ S2K ÒÅÖÉÍ (0) ÏÞÅÎØ ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ\n"
 
-#: g10/g10.c:1036
+#: g10/g10.c:1091
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÒÅÖÉÍ S2K: ÄÏÌÖÅÎ ÂÙÔØ 0, 1 ÉÌÉ 3\n"
 
-#: g10/g10.c:1121
+#: g10/g10.c:1176
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "ïÛÉÂËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ: %s\n"
 
-#: g10/g10.c:1127
+#: g10/g10.c:1182
 msgid "--store [filename]"
 msgstr "--store [ÉÍÑ ÆÁÊÌÁ]"
 
-#: g10/g10.c:1134
+#: g10/g10.c:1189
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ÉÍÑ ÆÁÊÌÁ]"
 
-#: g10/g10.c:1142
+#: g10/g10.c:1197
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ÉÍÑ ÆÁÊÌÁ]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1210
 msgid "--sign [filename]"
 msgstr "--sign [ÉÍÑ ÆÁÊÌÁ]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1223
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ÉÍÑ ÆÁÊÌÁ]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1237
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ÉÍÑ ÆÁÊÌÁ]"
 
-#: g10/g10.c:1199
+#: g10/g10.c:1254
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ÉÍÑ ÆÁÊÌÁ]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1262
 msgid "--sign-key user-id"
 msgstr ""
 
-#: g10/g10.c:1215
+#: g10/g10.c:1270
 #, fuzzy
 msgid "--lsign-key user-id"
 msgstr "--delete-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1278
 #, fuzzy
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: g10/g10.c:1239
+#: g10/g10.c:1294
 #, fuzzy
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1297
 #, fuzzy
 msgid "--delete-key user-id"
 msgstr "--delete-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
+#: g10/g10.c:1305
+#, fuzzy
+msgid "--delete-secret-and-public-key user-id"
+msgstr "--delete-secret-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ"
+
+#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1357
 #, fuzzy
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ] [Ó×ÑÚËÁ ËÌÀÞÅÊ]"
 
-#: g10/g10.c:1360
+#: g10/g10.c:1423
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ÏÛÉÂËÁ ÄÅËÏÄÉÒÏ×ÁÎÉÑ: %s\n"
 
-#: g10/g10.c:1368
+#: g10/g10.c:1431
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ÏÛÉÂËÁ ËÏÄÉÒÏ×ÁÎÉÑ: %s\n"
 
-#: g10/g10.c:1439
+#: g10/g10.c:1502
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÈÜÛ-ÁÌÇÏÒÉÔÍ `%s'\n"
 
-#: g10/g10.c:1520
+#: g10/g10.c:1589
 msgid "[filename]"
 msgstr "[ÉÍÑ ÆÁÊÌÁ]"
 
-#: g10/g10.c:1524
+#: g10/g10.c:1593
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s'\n"
 
-#: g10/g10.c:1737
+#: g10/g10.c:1805
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/g10.c:1743
+#: g10/g10.c:1811
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1749
+#: g10/g10.c:1817
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1757
+#: g10/g10.c:1825
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
-#: g10/armor.c:302
+#: g10/armor.c:306
 #, fuzzy, c-format
 msgid "armor: %s\n"
 msgstr "ëÏÄÉÒÏ×ËÁ: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:335
 msgid "invalid armor header: "
 msgstr ""
 
-#: g10/armor.c:338
+#: g10/armor.c:342
 msgid "armor header: "
 msgstr ""
 
-#: g10/armor.c:349
+#: g10/armor.c:353
 #, fuzzy
 msgid "invalid clearsig header\n"
 msgstr "ÎÅÄÏÐÕÓÔÉÍÏÅ ÎÁÞÁÌÏ ÔÅËÓÔÏ×ÏÊ ÐÏÄÐÉÓÉ\n"
 
-#: g10/armor.c:401
+#: g10/armor.c:405
 #, fuzzy
 msgid "nested clear text signatures\n"
 msgstr "|[ÆÁÊÌ]|ÓÏÚÄÁÔØ ÔÅËÓÔÏ×ÕÀ ÐÏÄÐÉÓØ"
 
-#: g10/armor.c:525
+#: g10/armor.c:529
 msgid "invalid dash escaped line: "
 msgstr "ÎÅÄÏÐÕÓÔÉÍÁÑ ÓÔÒÏËÁ ÎÁÞÉÎÁÀÝÁÑÓÑ Ó ÍÉÎÕÓÏ×: "
 
-#: g10/armor.c:537
+#: g10/armor.c:541
 #, fuzzy
 msgid "unexpected armor:"
 msgstr "îÅÏÖÉÄÁÎÎÙÅ ÄÁÎÎÙÅ"
 
-#: g10/armor.c:654
+#: g10/armor.c:667 g10/armor.c:1235
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÄÌÑ ËÏÄÉÒÏ×ËÉ radix64 ÓÉÍ×ÏÌ %02x ÐÒÏÐÕÝÅÎ\n"
 
-#: g10/armor.c:697
+#: g10/armor.c:710
 msgid "premature eof (no CRC)\n"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ (ÎÅÔ CRC)\n"
 
-#: g10/armor.c:731
+#: g10/armor.c:744
 msgid "premature eof (in CRC)\n"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ (× CRC)\n"
 
-#: g10/armor.c:735
+#: g10/armor.c:748
 msgid "malformed CRC\n"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÁÑ ÆÏÒÍÁ CRC\n"
 
-#: g10/armor.c:739
+#: g10/armor.c:752 g10/armor.c:1272
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "ÏÛÉÂËÁ CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:772
 msgid "premature eof (in Trailer)\n"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ (× È×ÏÓÔÅ)\n"
 
-#: g10/armor.c:760
+#: g10/armor.c:776
 msgid "error in trailer line\n"
 msgstr "ÏÛÉÂËÁ × ÚÁ×ÅÒÛÁÀÝÅÊ ÓÔÒÏËÅ\n"
 
-#: g10/armor.c:906
+#: g10/armor.c:922
 msgid "For info see http://www.gnupg.org"
 msgstr ""
 
-#: g10/armor.c:1027
+#: g10/armor.c:1050
 #, fuzzy
 msgid "no valid OpenPGP data found.\n"
 msgstr "ÎÅ ÎÁÊÄÅÎÏ ÄÏÐÕÓÔÉÍÙÈ RFC1991 ÉÌÉ OpenPGP ÄÁÎÎÙÈ.\n"
 
-#: g10/armor.c:1032
+#: g10/armor.c:1055
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr ""
 
-#: g10/armor.c:1036
+#: g10/armor.c:1059
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr ""
 
@@ -1274,17 +1294,17 @@
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "          îÅÔ Õ×ÅÒÅÎÎÏÓÔÉ, ÞÔÏ ÐÏÄÐÉÓØ ÐÒÉÎÁÄÌÅÖÉÔ ×ÌÁÄÅÌØÃÕ.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ÐÒÏÐÕÝÅÎ: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr ""
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1293,43 +1313,43 @@
 "\"-r\").\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "÷×ÅÄÉÔÅ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "îÅÔ ÔÁËÏÇÏ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:903
 #, fuzzy
 msgid "Public key is disabled.\n"
 msgstr "ïÔËÒÙÔÙÊ ËÌÀÞ ÎÅ ÎÁÊÄÅÎ"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr ""
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
 #, fuzzy, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "ÚÁÍÅÞÁÎÉÅ: ÆÁÊÌ ÐÁÒÁÍÅÔÒÏ× ÐÏ ÕÍÏÌÞÁÎÉÀ `%s' ÏÔÓÕÔÓÔ×ÕÅÔ\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: ÏÛÉÂËÁ ÐÒÉ ÐÒÏ×ÅÒËÅ ËÌÀÞÁ: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr ""
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "ÎÅÔ ÄÏÐÕÓÔÉÍÙÈ ÁÄÒÅÓÏ×\n"
 
@@ -1337,63 +1357,67 @@
 msgid "writing self signature\n"
 msgstr "ÐÉÛÅÔÓÑ ÓÁÍÏ-ÐÏÄÐÉÓØ\n"
 
-#: g10/keygen.c:214
+#: g10/keygen.c:217
 msgid "writing key binding signature\n"
 msgstr "ÐÉÛÅÔÓÑ \"key-binding\" ÐÏÄÐÉÓØ\n"
 
-#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
+#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "úÁÐÒÏÛÅÎÎÙÊ ËÌÀÞ ÉÍÅÅÔ ÄÌÉÎÕ %u ÂÉÔ\n"
 
-#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
+#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "ÏËÒÕÇÌÅÎÏ ÄÏ %u ÂÉÔ\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:549
 msgid "Please select what kind of key you want:\n"
 msgstr "÷ÙÂÅÒÉÔÅ ÖÅÌÁÅÍÙÊ ÔÉÐ ËÌÀÞÁ:\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:551
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA É ElGamal (ÐÏ ÕÍÏÌÞÁÎÉÀ)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:552
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (ÔÏÌØËÏ ÐÏÄÐÉÓØ)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:554
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (ÔÏÌØËÏ ÛÉÆÒÏ×ÁÎÉÅ)\n"
 
-#: g10/keygen.c:546
+#: g10/keygen.c:555
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (ÐÏÄÐÉÓØ É ÛÉÆÒÏ×ÁÎÉÅ)\n"
 
-#: g10/keygen.c:548
+#: g10/keygen.c:557
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (ÐÏÄÐÉÓØ É ÛÉÆÒÏ×ÁÎÉÅ)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:561
 msgid "Your selection? "
 msgstr "÷ÁÛ ×ÙÂÏÒ? "
 
-#: g10/keygen.c:563 g10/keygen.c:571
+#: g10/keygen.c:572
 #, fuzzy
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ×ÙÂÒÁÎÎÙÅ ËÌÀÞÉ? "
 
-#: g10/keygen.c:585
+#: g10/keygen.c:580
+msgid "The use of this algorithm is deprecated - create anyway? "
+msgstr ""
+
+#: g10/keygen.c:594
 msgid "Invalid selection.\n"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ×ÙÂÏÒ.\n"
 
-#: g10/keygen.c:597
+#: g10/keygen.c:606
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1406,19 +1430,19 @@
 "               ÄÌÉÎÁ ËÌÀÞÁ ÐÏ ÕÍÏÌÞÁÎÉÀ: 1024 ÂÉÔÁ\n"
 " ÍÁËÓÉÍÁÌØÎÁÑ ÒÅËÏÍÅÎÄÕÅÍÁÑ ÄÌÉÎÁ ËÌÀÞÁ: 2048 ÂÉÔ\n"
 
-#: g10/keygen.c:604
+#: g10/keygen.c:613
 msgid "What keysize do you want? (1024) "
 msgstr "ëÁËÏÇÏ ÒÁÚÍÅÒÁ ËÌÀÞ ×Ù ÖÅÌÁÅÔÅ? (1024)"
 
-#: g10/keygen.c:609
+#: g10/keygen.c:618
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "äÏÐÕÓÔÉÍÙÊ ÒÁÚÍÅÒ DSA ËÌÀÞÅÊ - ÏÔ 512 ÄÏ 1024 ÂÉÔ\n"
 
-#: g10/keygen.c:611
+#: g10/keygen.c:620
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "ÓÌÉÛËÏÍ ÍÁÌÅÎØËÁÑ ÄÌÉÎÁ ËÌÀÞÁ, ÎÁÉÍÅÎØÛÅÅ ÚÎÁÞÅÎÉÅ - 768.\n"
 
-#: g10/keygen.c:613
+#: g10/keygen.c:622
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "ÓÌÉÛËÏÍ ÍÁÌÅÎØËÁÑ ÄÌÉÎÁ ËÌÀÞÁ, ÎÁÉÍÅÎØÛÅÅ ÚÎÁÞÅÎÉÅ - 768.\n"
@@ -1431,12 +1455,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:624
+#: g10/keygen.c:633
 #, fuzzy, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "ÓÌÉÛËÏÍ ÍÁÌÅÎØËÁÑ ÄÌÉÎÁ ËÌÀÞÁ, ÎÁÉÍÅÎØÛÅÅ ÚÎÁÞÅÎÉÅ - 768.\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:638
 #, fuzzy
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
@@ -1445,11 +1469,11 @@
 "ëÌÀÞÉ ÄÌÉÎÏÊ ÂÏÌØÛÅ 2048 ÎÅ ÒÅËÏÍÅÎÄÕÀÔÓÑ, ÐÏÔÏÍÕ ÞÔÏ ×ÙÞÉÓÌÅÎÉÑÚÁÎÉÍÁÀÔ "
 "ïþåîø ÍÎÏÇÏ ×ÒÅÍÅÎÉ!\n"
 
-#: g10/keygen.c:632
+#: g10/keygen.c:641
 msgid "Are you sure that you want this keysize? "
 msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ËÌÀÞ ÔÁËÏÊ ÄÌÉÎÙ? "
 
-#: g10/keygen.c:633
+#: g10/keygen.c:642
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1457,21 +1481,21 @@
 "ïË, ÔÏÌØËÏ ÎÅ ÚÁÂÙ×ÁÊÔÅ, ÞÔÏ ÉÚÌÕÞÅÎÉÅ ×ÁÛÉÈ ËÌÁ×ÉÁÔÕÒÙ É ÍÏÎÉÔÏÒÁ ÔÏÖÅ\n"
 "ÄÅÌÁÀÔ ×ÁÓ ÕÑÚ×ÉÍÙÍ ÄÌÑ ÁÔÁË.\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:650
 msgid "Do you really need such a large keysize? "
 msgstr "÷ÁÍ ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÎÕÖÅÎ ÔÁËÏÊ ÄÌÉÎÎÙÊ ËÌÀÞ? "
 
-#: g10/keygen.c:647
+#: g10/keygen.c:656
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "úÁÐÒÏÛÅÎÎÙÊ ËÌÀÞ ÉÍÅÅÔ ÄÌÉÎÕ %u ÂÉÔ\n"
 
-#: g10/keygen.c:650 g10/keygen.c:654
+#: g10/keygen.c:659 g10/keygen.c:663
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "ÏËÒÕÇÌÅÎÏ ÄÏ %u ÂÉÔ\n"
 
-#: g10/keygen.c:702
+#: g10/keygen.c:711
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1487,35 +1511,35 @@
 "      <n>m = ÓÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ n ÍÅÓÑÃÅ×\n"
 "      <n>y = ÓÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ n ÌÅÔ\n"
 
-#: g10/keygen.c:717
+#: g10/keygen.c:726
 msgid "Key is valid for? (0) "
 msgstr "ëÌÀÞ ÄÅÊÓÔ×ÉÔÅÌÅÎ × ÔÅÞÅÎÉÅ? (0) "
 
-#: g10/keygen.c:722
+#: g10/keygen.c:731
 msgid "invalid value\n"
 msgstr "ÎÅÄÏÐÕÓÔÉÍÏÅ ÚÎÁÞÅÎÉÅ.\n"
 
-#: g10/keygen.c:727
+#: g10/keygen.c:736
 msgid "Key does not expire at all\n"
 msgstr "âÅÓÓÒÏÞÎÙÊ ËÌÀÞ.\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:733
+#: g10/keygen.c:742
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "ëÌÀÞ ÄÅÊÓÔ×ÕÅÔ ÄÏ %s\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:745
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:741
+#: g10/keygen.c:750
 msgid "Is this correct (y/n)? "
 msgstr "üÔÏ ×ÅÒÎÏ? (y/n) "
 
-#: g10/keygen.c:784
+#: g10/keygen.c:793
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1531,44 +1555,44 @@
 "    \"Vasya Pupkin (KRUTOI) <vasya@mega-cool.ru>\"\n"
 "\n"
 
-#: g10/keygen.c:796
+#: g10/keygen.c:805
 msgid "Real name: "
 msgstr "÷ÁÛÅ ÉÍÑ (\"éÍÑ æÁÍÉÌÉÑ\"): "
 
-#: g10/keygen.c:804
+#: g10/keygen.c:813
 msgid "Invalid character in name\n"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ÉÍÅÎÉ\n"
 
-#: g10/keygen.c:806
+#: g10/keygen.c:815
 msgid "Name may not start with a digit\n"
 msgstr "ðÏÌÎÏÅ ÉÍÑ ÎÅ ÍÏÖÅÔ ÎÁÞÉÎÁÔØÓÑ Ó ÃÉÆÒÙ.\n"
 
-#: g10/keygen.c:808
+#: g10/keygen.c:817
 msgid "Name must be at least 5 characters long\n"
 msgstr "ðÏÌÎÏÅ ÉÍÑ ÄÏÌÖÎÏ ÓÏÓÔÏÑÔØ ÎÅ ÍÅÎÅÅ ÞÅÍ ÉÚ 5ÔÉ ÓÉÍ×ÏÌÏ×.\n"
 
-#: g10/keygen.c:816
+#: g10/keygen.c:825
 msgid "Email address: "
 msgstr "E-Mail: "
 
-#: g10/keygen.c:827
+#: g10/keygen.c:836
 msgid "Not a valid email address\n"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ E-Mail\n"
 
-#: g10/keygen.c:835
+#: g10/keygen.c:844
 msgid "Comment: "
 msgstr "ëÏÍÍÅÎÔÁÒÉÊ: "
 
-#: g10/keygen.c:841
+#: g10/keygen.c:850
 msgid "Invalid character in comment\n"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ËÏÍÍÅÎÔÁÒÉÉ.\n"
 
-#: g10/keygen.c:864
+#: g10/keygen.c:873
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:870
+#: g10/keygen.c:879
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1579,29 +1603,29 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:883
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:879
+#: g10/keygen.c:888
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:889
+#: g10/keygen.c:898
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "éÚÍÅÎÉÔØ: N=éÍÑ, C=ëÏÍÍÅÎÔÁÒÉÊ, E=E-Mail, O=Okay/Q=÷ÙÈÏÄ? "
 
-#: g10/keygen.c:890
+#: g10/keygen.c:899
 #, 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:909
+#: g10/keygen.c:918
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:947
+#: g10/keygen.c:956
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1609,11 +1633,11 @@
 "äÌÑ ÚÁÝÉÔÙ ×ÁÛÅÇÏ ËÌÀÞÁ ÎÕÖÎÁ ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:964
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ ÎÅ ÂÙÌÁ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÁ, ÐÏÐÒÏÂÕÊÔÅ ÓÎÏ×Á.\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:970
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1625,7 +1649,7 @@
 "×ÒÅÍÑ, ÚÁÐÕÓÔÉ× ÜÔÕ ÐÒÏÇÒÁÍÍÕ Ó ÐÁÒÁÍÅÔÒÏÍ \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:982
+#: g10/keygen.c:991
 #, fuzzy
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
@@ -1638,30 +1662,30 @@
 "ÎÁÇÒÕÚÉÔØ ÓÅÔÅ×ÕÀ ÉÌÉ ÄÉÓËÏ×ÕÀ ÐÏÄÓÉÓÔÅÍÕ). üÔÏ ÄÁÓÔ ÇÅÎÅÒÁÔÏÒÕ ÓÌÕÞÁÊÎÙÈ\n"
 "ÞÉÓÅÌ ×ÏÚÍÏÖÎÏÓÔØ ÎÁÂÒÁÔØ ÄÏÓÔÁÔÏÞÎÏ ÜÎÔÒÏÐÉÉ.\n"
 
-#: g10/keygen.c:1431
+#: g10/keygen.c:1440
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "ëÌÀÞÅ×ÁÑ ÐÁÒÁ DSA ÂÕÄÅÔ ÉÍÅÔØ ÄÌÉÎÕ 1024 ÂÉÔÁ.\n"
 
-#: g10/keygen.c:1474
+#: g10/keygen.c:1483
 #, fuzzy
 msgid "Key generation canceled.\n"
 msgstr "çÅÎÅÒÁÃÉÑ ËÌÀÞÁ ÏÔÍÅÎÅÎÁ: %s\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1581
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "ÏÔËÒÙÔÙÊ ÓÅÒÔÉÆÉËÁÔ ÚÁÐÉÓÙ×ÁÅÔÓÑ × `%s'\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1582
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "ÓÅËÒÅÔÎÙÊ ÓÅÒÔÉÆÉËÁÔ ÚÁÐÉÓÙ×ÁÅÔÓÑ × `%s'\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1679
 msgid "public and secret key created and signed.\n"
 msgstr "ÏÔËÒÙÔÙÊ É ÓÅËÒÅÔÎÙÊ ËÌÀÞÉ ÓÏÚÄÁÎÙ É ÐÏÄÐÉÓÁÎÙ.\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1684
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -1672,12 +1696,12 @@
 "ÄÏÐÏÌÎÉÔÅÌØÎÏÇÏ\n"
 "ËÌÀÞÁ ÄÌÑ ÛÉÆÒÏ×ÁÎÉÑ.\n"
 
-#: g10/keygen.c:1690 g10/keygen.c:1791
+#: g10/keygen.c:1701 g10/keygen.c:1807
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "çÅÎÅÒÁÃÉÑ ËÌÀÞÁ ÎÅ ÕÄÁÌÁÓØ: %s\n"
 
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1748 g10/sig-check.c:315 g10/sign.c:112
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1685,7 +1709,7 @@
 "ÏÔËÒÙÔÙÊ ËÌÀÞ ÓÇÅÎÅÒÉÒÏ×ÁÎ × ÂÕÄÕÝÅÍ (ÉÓËÒÉ×ÌÅÎÉÅ ×ÒÅÍÅÎÉ ÉÌÉ ÎÅÐÒÁ×ÉÌØÎÏ "
 "ÕÓÔÁÎÏ×ÌÅÎÙ ÞÁÓÙ)\n"
 
-#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1750 g10/sig-check.c:317 g10/sign.c:114
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1693,12 +1717,12 @@
 "ÏÔËÒÙÔÙÊ ËÌÀÞ ÓÇÅÎÅÒÉÒÏ×ÁÎ × ÂÕÄÕÝÅÍ (ÉÓËÒÉ×ÌÅÎÉÅ ×ÒÅÍÅÎÉ ÉÌÉ ÎÅÐÒÁ×ÉÌØÎÏ "
 "ÕÓÔÁÎÏ×ÌÅÎÙ ÞÁÓÙ)\n"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1783
 #, fuzzy
 msgid "Really create? "
 msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÓÏÚÄÁÔØ? "
 
-#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1709,17 +1733,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr "ÏÛÉÂËÁ ÐÒÉ ÓÏÚÄÁÎÉÉ ËÌÀÞÅ×ÏÊ ÆÒÁÚÙ: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, fuzzy, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÕÓÔÏÊ ÆÁÊÌ.\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "þÉÔÁÅÔÓÑ ÉÚ `%s'\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s ÚÁÛÉÆÒÏ×ÁÎÏ ÄÌÑ: %s\n"
@@ -1744,285 +1768,283 @@
 msgid "key %08lX: not protected - skipped\n"
 msgstr "ÓÅËÒÅÔÎÙÊ ËÌÀÞ %08lX: ÎÅ ÉÍÅÅÔ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÏÔËÒÙÔÏÇÏ ËÌÀÞÁ.\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 #, fuzzy
 msgid "WARNING: nothing exported\n"
 msgstr "÷îéíáîéå: éÓÐÏÌØÚÕÅÔÓÑ ËÌÀÞ Ë ËÏÔÏÒÏÍÕ ÎÅÔ ÄÏ×ÅÒÉÑ!\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:214
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:350
-msgid "too many entries in unk cache - disabled\n"
-msgstr ""
-
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr ""
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
 #, fuzzy
-msgid "No key for user ID\n"
-msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ\n"
+msgid "[User id not found]"
+msgstr "%s: ÐÏÌØÚÏ×ÁÔÅÌØ ÎÅ ÎÁÊÄÅÎ\n"
 
-#: g10/getkey.c:1388 g10/getkey.c:1428
-#, fuzzy
-msgid "No user ID for key\n"
-msgstr "ðÌÏÈÏÊ ÓÅËÒÅÔÎÙÊ ËÌÀÞ"
+#: g10/getkey.c:453
+msgid "too many entries in unk cache - disabled\n"
+msgstr ""
 
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2207
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "ÉÓÐÏÌØÚÕÅÔÓÑ ÄÏÐÏÌÎÉÔÅÌØÎÙÊ ËÌÀÞ %09lX ×ÍÅÓÔÏ ÏÓÎÏ×ÎÏÇÏ %08lX%\n"
 
-#: g10/getkey.c:2050
-#, fuzzy
-msgid "[User id not found]"
-msgstr "%s: ÐÏÌØÚÏ×ÁÔÅÌØ ÎÅ ÎÁÊÄÅÎ\n"
+#: g10/getkey.c:2249 g10/trustdb.c:577
+#, fuzzy, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "ÓÅËÒÅÔÎÙÊ ËÌÀÞ %08lX: ÎÅ ÉÍÅÅÔ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÏÔËÒÙÔÏÇÏ ËÌÀÞÁ.\n"
 
-#: g10/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ÐÒÏÐÕÓËÁÅÍ ÂÌÏË ÔÉÐÁ %d\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr ""
 
-#: g10/import.c:194
+#: g10/import.c:196
 #, fuzzy, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr ""
 
-#: g10/import.c:206
+#: g10/import.c:208
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "ËÌÀÞ %08lX: %d ÎÏ×ÙÈ ÐÏÄÐÉÓÅÊ\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr ""
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr ""
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, fuzzy, c-format
 msgid "        new signatures: %lu\n"
 msgstr "ËÌÀÞ %08lX: %d ÎÏ×ÙÈ ÐÏÄÐÉÓÅÊ\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr ""
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr ""
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, fuzzy, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "ËÌÀÞ %08lX: ÓÅËÒÅÔÎÙÊ ËÌÀÞ ÉÍÐÏÒÔÉÒÏ×ÁÎ\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, fuzzy, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎ ÎÅÐÒÁ×ÉÌØÎÙÊ ÓÅËÒÅÔÎÙÊ ËÌÀÞ"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:408 g10/import.c:617
 #, fuzzy, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, fuzzy, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "ËÌÀÞ %08lX: ÎÅÔ ÄÏÐÕÓÔÉÍÙÈ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÐÏÌØÚÏ×ÁÔÅÌÅÊ\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 msgid "this may be caused by a missing self-signature\n"
 msgstr "ÜÔÏ ÍÏÖÅÔ ÂÙÔØ ×ÙÚ×ÁÎÏ ÏÔÓÕÔÓÔ×ÉÅÍ ÓÁÍÏ-ÐÏÄÐÉÓÉ\n"
 
-#: g10/import.c:418 g10/import.c:657
+#: g10/import.c:435 g10/import.c:684
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "ËÌÀÞ %08lX: ÏÔËÒÙÔÙÊ ËÌÀÞ ÎÅ ÎÁÊÄÅÎ: %s\n"
 
-#: g10/import.c:423
+#: g10/import.c:440
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "ÓÅËÒÅÔÎÙÊ ËÌÀÞ %08lX: ÎÅ ÉÍÅÅÔ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÏÔËÒÙÔÏÇÏ ËÌÀÞÁ.\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "ÎÅÔ Ó×ÑÚËÉ ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ ÐÏ ÕÍÏÌÞÁÎÉÀ\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "ÚÁÐÉÓÙ×ÁÅÔÓÑ × `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
 #, fuzzy, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÂÌÏËÉÒÏ×ÁÔØ Ó×ÑÚËÕ ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ: %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, fuzzy, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "ËÌÀÞ %08lX: ÏÔËÒÙÔÙÊ ËÌÀÞ ÉÍÐÏÒÔÉÒÏ×ÁÎ\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "ËÌÀÞ %08lX: ÎÅ ÓÏ×ÐÁÄÁÅÔ Ó ÎÁÛÅÊ ËÏÐÉÅÊ\n"
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:489 g10/import.c:692
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "ËÌÀÞ %08lX: ÎÅ×ÏÚÍÏÖÎÏ ÏÂÎÁÒÕÖÉÔØ original keyblock: %s\n"
 
-#: g10/import.c:478 g10/import.c:671
+#: g10/import.c:495 g10/import.c:698
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "ËÌÀÞ %08lX: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ original keyblock: %s\n"
 
-#: g10/import.c:505
+#: g10/import.c:522
 #, fuzzy, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "ËÌÀÞ %08lX: 1 ÎÏ×ÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ\n"
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, fuzzy, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "ËÌÀÞ %08lX: %d ÎÏ×ÙÈ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÐÏÌØÚÏ×ÁÔÅÌÅÊ\n"
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "ËÌÀÞ %08lX: 1 ÎÏ×ÁÑ ÐÏÄÐÉÓØ\n"
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "ËÌÀÞ %08lX: %d ÎÏ×ÙÈ ÐÏÄÐÉÓÅÊ\n"
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "ËÌÀÞ %08lX: 1 ÎÏ×ÙÊ ÐÏÄ-ËÌÀÞ\n"
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "ËÌÀÞ %08lX: %d ÎÏ×ÙÈ ÐÏÄ-ËÌÀÞÅÊ\n"
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "ËÌÀÞ %08lX: ÎÅ ÉÚÍÅÎÅÎ\n"
 
-#: g10/import.c:613
+#: g10/import.c:610
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:640
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "ËÌÀÞ %08lX: ÓÅËÒÅÔÎÙÊ ËÌÀÞ ÉÍÐÏÒÔÉÒÏ×ÁÎ\n"
 
 #. we can't merge secret keys
-#: g10/import.c:617
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "ËÌÀÞ %08lX: ÕÖÅ ÎÁ Ó×ÑÚËÅ ÓÅËÒÅÔÎÙÈ ËÌÀÞÅÊ\n"
 
-#: g10/import.c:622
+#: g10/import.c:649
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "ËÌÀÞ %08lX: ÓÅËÒÅÔÎÙÊ ËÌÀÞ ÎÅ ÎÁÊÄÅÎ: %s\n"
 
-#: g10/import.c:651
+#: g10/import.c:678
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "ËÌÀÞ %08lX: ÎÅÔ ÏÔËÒÙÔÏÇÏ ËÌÀÞÁ - ÎÅ×ÏÚÍÏÖÎÏ ÐÒÉÍÅÎÉÔØ ÏÔÚÙ×ÁÀÝÉÊ "
 "ÓÅÒÔÉÆÉËÁÔ\n"
 
-#: g10/import.c:682
+#: g10/import.c:709
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "ËÌÀÞ %08lX: ÎÅÄÏÐÕÓÔÉÍÙÊ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ: %s - ÏÔ×ÅÒÇÎÕÔ\n"
 
-#: g10/import.c:714
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "ËÌÀÞ %08lX: ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ ÉÍÐÏÒÔÉÒÏ×ÁÎ\n"
 
-#: g10/import.c:756
+#: g10/import.c:783
 #, fuzzy, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÐÏÄÐÉÓÉ\n"
 
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:790 g10/import.c:814
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "ËÌÀÞ %08lX: ÎÅÐÏÄÄÅÒÖÉ×ÁÅÍÙÊ ÁÌÇÏÒÉÔÍ ÏÔËÒÙÔÏÇÏ ËÌÀÞÁ\n"
 
-#: g10/import.c:764
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "ËÌÀÞ %08lX: ÎÅÄÏÐÕÓÔÉÍÁÑ ÓÁÍÏ-ÐÏÄÐÉÓØ\n"
 
-#: g10/import.c:779
+#: g10/import.c:806
 #, fuzzy, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ\n"
 
-#: g10/import.c:788
+#: g10/import.c:815
 #, fuzzy, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "ËÌÀÞ %08lX: ÎÅÔ ÄÏÐÕÓÔÉÍÙÈ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÐÏÌØÚÏ×ÁÔÅÌÅÊ\n"
 
-#: g10/import.c:815
+#: g10/import.c:842
 #, fuzzy, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "ËÌÀÞ %08lX: ÐÒÏÐÕÝÅÎ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ '"
 
-#: g10/import.c:844
+#: g10/import.c:871
 #, fuzzy, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "ËÌÀÞ %08lX: ÐÒÏÐÕÝÅÎ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ '"
 
-#: g10/import.c:867
+#: g10/import.c:894
 #, fuzzy, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "ËÌÀÞ %08lX: 1 ÎÏ×ÙÊ ÐÏÄ-ËÌÀÞ\n"
@@ -2031,86 +2053,86 @@
 #. * 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:892
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "ËÌÀÞ %08lX: ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ × ÎÅÐÒÁ×ÉÌØÎÏÍ ÍÅÓÔÅ - ÐÒÏÐÕÝÅÎ\n"
 
-#: g10/import.c:901
+#: g10/import.c:928
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "ËÌÀÞ %08lX: ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ × ÎÅÐÒÁ×ÉÌØÎÏÍ ÍÅÓÔÅ - ÐÒÏÐÕÝÅÎ\n"
 
-#: g10/import.c:909
+#: g10/import.c:936
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "ËÌÀÞ %08lX: ÎÅÄÏÐÕÓÔÉÍÙÊ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ: %s - ÐÒÏÐÕÝÅÎ\n"
 
-#: g10/import.c:1009
+#: g10/import.c:1036
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1060
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "ËÌÀÞ %08lX: ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ ÄÏÂÁ×ÌÅÎ\n"
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "ËÌÀÞ %08lX: ÎÁÛÁ ËÏÐÉÑ ÎÅ ÉÍÅÅÔ ÓÁÍÏ-ÐÏÄÐÉÓÉ\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: ÐÏÌØÚÏ×ÁÔÅÌØ ÎÅ ÎÁÊÄÅÎ\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 #, fuzzy
 msgid "[self-signature]"
 msgstr "[ÓÁÍÏ-ÐÏÄÐÉÓØ]\n"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 #, fuzzy
 msgid "1 bad signature\n"
 msgstr "1 ÐÌÏÈÁÑ ÐÏÄÐÉÓØ\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ÐÌÏÈÉÈ ÐÏÄÐÉÓÅÊ\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 #, fuzzy
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 ÐÏÄÐÉÓØ ÎÅ ÐÒÏ×ÅÒÅÎÁ ÉÚ-ÚÁ ÏÔÓÕÔÓÔ×ÉÑ ËÌÀÞÁ\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, fuzzy, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%s ÐÏÄÐÉÓÅÊ ÎÅ ÐÒÏ×ÅÒÅÎÏ ÉÚ-ÚÁ ÏÔÓÕÔÓÔ×ÉÑ ËÌÀÞÅÊ\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 #, fuzzy
 msgid "1 signature not checked due to an error\n"
 msgstr "1 ÐÏÄÐÉÓØ ÎÅ ÐÒÏ×ÅÒÅÎÁ ÉÚ-ÚÁ ÏÛÉÂËÉ\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%s ÐÏÄÐÉÓÅÊ ÎÅ ÐÒÏ×ÅÒÅÎÏ ÉÚ-ÚÁ ÏÛÉÂÏË\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 #, fuzzy
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "ÏÂÎÁÒÕÖÅÎ 1 ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ ÂÅÚ ÄÏÐÕÓÔÉÍÏÊ ÓÁÍÏ-ÐÏÄÐÉÓÉ\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, fuzzy, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
@@ -2118,57 +2140,57 @@
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, fuzzy, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "õÖÅ ÐÏÄÐÉÓÁÎÏ ËÌÀÞÏÍ %08lX.\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, fuzzy, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "îÅÞÅÇÏ ÐÏÄÐÉÓÙ×ÁÔØ ËÌÀÞÁÍ %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 #, fuzzy
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ Õ×ÅÒÅÎÙ, ÞÔÏ ÈÏÔÉÔÅ ÐÏÄÐÉÓÁÔØ ÜÔÏÔ ËÌÀÞ Ó×ÏÉÍ:\n"
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÐÏÄÐÉÓÁÔØ? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
 #, fuzzy, c-format
 msgid "signing failed: %s\n"
 msgstr "ÏÛÉÂËÁ ÐÏÄÐÉÓÙ×ÁÎÉÑ: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "üÔÏÔ ËÌÀÞ ÎÅ ÚÁÝÉÝÅÎ.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:432
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "óÅËÒÅÔÎÙÊ ËÌÀÞ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "üÔÏÔ ËÌÀÞ ÚÁÝÉÝÅÎ.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÒÅÄÁËÔÉÒÏ×ÁÔØ ÜÔÏÔ ËÌÀÞ: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2176,7 +2198,7 @@
 "÷×ÅÄÉÔÅ ÎÏ×ÕÀ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ ÄÌÑ ÜÔÏÇÏ ÓÅËÒÅÔÎÏÇÏ ËÌÀÞÁ.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2184,641 +2206,641 @@
 "÷Ù ÎÅ ÈÏÔÉÔÅ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ - ÜÔÏ ÓËÏÒÅÅ ×ÓÅÇÏ *ÐÌÏÈÁÑ* ÉÄÅÑ!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÜÔÏÇÏ ÈÏÔÉÔÅ? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "×ÙÊÔÉ ÉÚ ÍÅÎÀ"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr ""
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr "ÚÁÐÉÓÁÔØ"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "ÚÁÐÉÓÁÔØ É ×ÙÊÔÉ"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr "ÐÏÍÏÝØ"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "ÐÏËÁÚÁÔØ ÐÏÍÏÝØ"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr ""
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 #, fuzzy
 msgid "show fingerprint"
 msgstr "ÐÏËÁÚÁÔØ \"ÏÔÐÅÞÁÔÏË ÐÁÌØÃÁ\""
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 #, fuzzy
 msgid "list"
 msgstr "ÓÐÉÓÏË"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 #, fuzzy
 msgid "list key and user IDs"
 msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ É ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÐÏÌØÚÏ×ÁÔÅÌÅÊ"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr ""
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr ""
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, fuzzy
 msgid "select user ID N"
 msgstr "×ÙÂÒÁÔØ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr "ËÌÀÞ"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "×ÙÂÒÁÔØ ÄÏÐÏÌÎÉÔÅÌØÎÙÊ ËÌÀÞ N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr "ÐÒÏ×ÅÒËÁ"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 #, fuzzy
 msgid "list signatures"
 msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ É ÉÈ ÐÏÄÐÉÓÅÊ"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr ""
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr "ÐÏÄÐÉÓÁÔØ"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 #, fuzzy
 msgid "sign the key"
 msgstr "ÐÏÄÐÉÓÁÔØ ËÌÀÞ"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr ""
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 #, fuzzy
 msgid "lsign"
 msgstr "ÐÏÄÐÉÓÁÔØ"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 #, fuzzy
 msgid "sign the key locally"
 msgstr "ÐÏÄÐÉÓÁÔØ ËÌÀÞ"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr "ÏÔÌÁÄËÁ"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr ""
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 #, fuzzy
 msgid "add a user ID"
 msgstr "ÄÏÂÁ×ÉÔØ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr ""
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 #, fuzzy
 msgid "delete user ID"
 msgstr "ÕÄÁÌÉÔØ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr ""
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 #, fuzzy
 msgid "add a secondary key"
 msgstr "ÄÏÂÁ×ÉÔØ ÄÏÐÏÌÎÉÔÅÌØÎÙÊ ËÌÀÞ"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "ÕÄÁÌÉÔØ ÄÏÐÏÌÎÉÔÅÌØÎÙÊ ËÌÀÞ"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 #, fuzzy
 msgid "delsig"
 msgstr "ÐÏÄÐÉÓÁÔØ"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 #, fuzzy
 msgid "delete signatures"
 msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ É ÉÈ ÐÏÄÐÉÓÅÊ"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr ""
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 #, fuzzy
 msgid "change the expire date"
 msgstr "ÉÚÍÅÎÉÔØ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr ""
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "ÐÅÒÅËÌÀÞÉÔØ ÍÅÖÄÕ ÓÐÉÓËÏÍ ÓÅËÒÅÔÎÙÈ É ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr ""
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr ""
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606 g10/keyedit.c:607
 msgid "list preferences"
 msgstr ""
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
+msgid "showpref"
+msgstr ""
+
+#: g10/keyedit.c:608
 msgid "passwd"
 msgstr ""
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:608
 #, fuzzy
 msgid "change the passphrase"
 msgstr "ÉÚÍÅÎÉÔØ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "trust"
 msgstr ""
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "change the ownertrust"
 msgstr "ÉÚÍÅÎÉÔØ ÐÁÒÁÍÅÔÒÙ ÄÏ×ÅÒÉÑ"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 #, fuzzy
 msgid "revsig"
 msgstr "ÐÏÄÐÉÓÁÔØ"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 #, fuzzy
 msgid "revoke signatures"
 msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ ÎÁ ËÌÀÞÅ"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 #, fuzzy
 msgid "revkey"
 msgstr "ËÌÀÞ"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 #, fuzzy
 msgid "revoke a secondary key"
 msgstr "ÕÄÁÌÉÔØ ÄÏÐÏÌÎÉÔÅÌØÎÙÊ ËÌÀÞ"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable"
 msgstr ""
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 #, fuzzy
 msgid "disable a key"
 msgstr "ðÌÏÈÏÊ ËÌÀÞ"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable"
 msgstr ""
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 #, fuzzy
 msgid "enable a key"
 msgstr "ðÌÏÈÏÊ ËÌÀÞ"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:633
 msgid "can't do that in batchmode\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÄÅÌÁÔØ ÜÔÏ × ÐÁËÅÔÎÏÍ ÒÅÖÉÍÅ.\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:669
+#: g10/keyedit.c:671
 #, fuzzy
 msgid "Secret key is available.\n"
 msgstr "éÍÅÅÔÓÑ ÓÅËÒÅÔÎÙÊ ËÌÀÞ.\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:700
 #, fuzzy
 msgid "Command> "
 msgstr "ëÏÍÁÎÄÁ> "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 #, fuzzy
 msgid "Need the secret key to do this.\n"
 msgstr "þÔÏÂÙ ÜÔÏ ÓÄÅÌÁÔØ, ÎÕÖÅÎ ÓÅËÒÅÔÎÙÊ ËÌÀÞ.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:781
 #, fuzzy
 msgid "Really sign all user IDs? "
 msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÐÏÄÐÉÓÁÔØ ×ÓÅ ÉÄÅÎÔÉÆÉËÁÔÏÒÙ ÐÏÌØÚÏ×ÁÔÅÌÑ? "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:782
 #, fuzzy
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 "ðÏÄÓËÁÚËÁ: ×ÙÂÅÒÉÔÅ ÉÄÅÎÔÉÆÉËÁÔÏÒÙ ÐÏÌØÚÏ×ÁÔÅÌÑ ËÏÔÏÒÙÅ ÈÏÔÉÔÅ ÐÏÄÐÉÓÁÔØ\n"
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:814 g10/keyedit.c:1000
 #, fuzzy, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ ÎÅ ÕÄÁÌÏÓØ: %s\n"
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:825 g10/keyedit.c:846
 #, fuzzy
 msgid "You must select at least one user ID.\n"
 msgstr "÷Ù ÄÏÌÖÎÙ ×ÙÂÒÁÔØ ÈÏÔÑ ÂÙ ÏÄÉÎ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ.\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:827
 #, fuzzy
 msgid "You can't delete the last user ID!\n"
 msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÕÄÁÌÉÔØ ÐÏÓÌÅÄÎÉÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ!\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:830
 #, fuzzy
 msgid "Really remove all selected user IDs? "
 msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÕÄÁÌÉÔØ ×ÓÅ ×ÙÂÒÁÎÎÙÅ ÉÄÅÎÔÉÆÉËÁÔÏÒÙ ÐÏÌØÚÏ×ÁÔÅÌÑ? "
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:831
 #, fuzzy
 msgid "Really remove this user ID? "
 msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÕÄÁÌÉÔØ ÜÔÏÔ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ? "
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:867 g10/keyedit.c:889
 msgid "You must select at least one key.\n"
 msgstr "÷Ù ÄÏÌÖÎÙ ×ÙÂÒÁÔØ ÈÏÔÑ ÂÙ ÏÄÉÎ ËÌÀÞ.\n"
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:871
 #, fuzzy
 msgid "Do you really want to delete the selected keys? "
 msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ×ÙÂÒÁÎÎÙÅ ËÌÀÞÉ? "
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:872
 #, fuzzy
 msgid "Do you really want to delete this key? "
 msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ÜÔÏÔ ËÌÀÞ? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:893
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? "
 msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ×ÙÂÒÁÎÎÙÅ ËÌÀÞÉ? "
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:894
 #, fuzzy
 msgid "Do you really want to revoke this key? "
 msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ÜÔÏÔ ËÌÀÞ? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
 msgid "Save changes? "
 msgstr "óÏÈÒÁÎÉÔØ ÉÚÍÅÎÅÎÉÑ? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:967
 msgid "Quit without saving? "
 msgstr "÷ÙÊÔÉ ÂÅÚ ÓÏÈÒÁÎÅÎÉÑ? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:978
 #, fuzzy, c-format
 msgid "update failed: %s\n"
 msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÎÅ ÕÄÁÌÏÓØ: %s\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:985
 #, fuzzy, c-format
 msgid "update secret failed: %s\n"
 msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÓÅËÒÅÔÁ ÎÅ ÕÄÁÌÏÓØ: %s\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:992
 msgid "Key not changed so no update needed.\n"
 msgstr "ëÌÀÞ ÎÅ ÉÚÍÅÎÉÌÓÑ, ÏÂÎÏ×ÌÅÎÉÅ ÎÅ ÎÕÖÎÏ.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1007
 msgid "Invalid command  (try \"help\")\n"
 msgstr "îÅÄÏÐÕÓÔÉÍÁÑ ËÏÍÁÎÄÁ (ÐÏÐÒÏÂÕÊÔÅ \"help\")\n"
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1090
+#: g10/keyedit.c:1140
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1144
 #, fuzzy
 msgid "This key has been disabled"
 msgstr "úÁÍÅÞÁÎÉÅ: óÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ ÕÖÅ ÉÓÔÅË!\n"
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1173
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "build_sigrecs: ËÌÀÞ ist widerrufen\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1176
 msgid "rev- faked revocation found\n"
 msgstr ""
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1178
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1420
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1424
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "Really delete this self-signature? (y/N)"
 msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1448
 #, fuzzy, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d ÐÌÏÈÉÈ ÐÏÄÐÉÓÅÊ\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1449
 #, fuzzy, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d ÐÌÏÈÉÈ ÐÏÄÐÉÓÅÊ\n"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "Nothing deleted.\n"
 msgstr "÷îéíáîéå: éÓÐÏÌØÚÕÅÔÓÑ ËÌÀÞ Ë ËÏÔÏÒÏÍÕ ÎÅÔ ÄÏ×ÅÒÉÑ!\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1521
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1527
 #, fuzzy
 msgid "Please select at most one secondary key.\n"
 msgstr "÷Ù ÄÏÌÖÎÙ ×ÙÂÒÁÔØ ÈÏÔÑ ÂÙ ÏÄÉÎ ËÌÀÞ.\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1531
 msgid "Changing expiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1533
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1575
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1591
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1652
 #, fuzzy, c-format
 msgid "No user ID with index %d\n"
 msgstr "îÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ Ó ÉÎÄÅËÓÏÍ %d\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1698
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "îÅÔ ÄÏÐÏÌÎÉÔÅÌØÎÏÇÏ ËÌÀÞÁ Ó ÉÎÄÅËÓÏÍ %d\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1796
 #, fuzzy
 msgid "user ID: \""
 msgstr "÷×ÅÄÉÔÅ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ: "
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1799
 #, fuzzy, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr "îÅÞÅÇÏ ÐÏÄÐÉÓÙ×ÁÔØ ËÌÀÞÁÍ %08lX\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1803
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1827
 #, fuzzy
 msgid "You have signed these user IDs:\n"
 msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÕÄÁÌÉÔØ ÐÏÓÌÅÄÎÉÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ!\n"
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "îÅÞÅÇÏ ÐÏÄÐÉÓÙ×ÁÔØ ËÌÀÞÁÍ %08lX\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1846
 #, fuzzy, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "îÅÞÅÇÏ ÐÏÄÐÉÓÙ×ÁÔØ ËÌÀÞÁÍ %08lX\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1866
 #, fuzzy
 msgid "You are about to revoke these signatures:\n"
 msgstr "Möchten Sie einige der ungültigen Signaturen entfernen? "
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1884
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1913
 #, fuzzy
 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:400 g10/mainproc.c:790
+#: g10/keylist.c:279 g10/mainproc.c:851
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "ëÌÀÞ ÄÅÊÓÔ×ÕÅÔ ÄÏ %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:269
 #, fuzzy, c-format
 msgid "public key is %08lX\n"
 msgstr "ïÔËÒÙÔÙÊ ËÌÀÞ ÎÅ ÎÁÊÄÅÎ"
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:314
 #, fuzzy
 msgid "public key encrypted data: good DEK\n"
 msgstr "ÒÁÓÛÉÆÒÏ×ËÁ ÏÔËÒÙÔÙÍ ËÌÀÞÏÍ ÎÅ ÕÄÁÌÁÓØ %s\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:366
 #, 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:336
+#: g10/mainproc.c:376
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "ðÏÄÐÉÓØ ÓÄÅÌÁÎÁ %.*s, ÉÓÐÏÌØÚÕÑ %s ËÌÀÞ %08lX\n"
 
-#: g10/mainproc.c:342
-#, fuzzy
-msgid "no secret key for decryption available\n"
-msgstr "óÅËÒÅÔÎÙÊ ËÌÀÞ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:390
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "ÒÁÓÛÉÆÒÏ×ËÁ ÏÔËÒÙÔÙÍ ËÌÀÞÏÍ ÎÅ ÕÄÁÌÁÓØ %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:430
 #, fuzzy
 msgid "decryption okay\n"
 msgstr "ÒÁÓÛÉÆÒÏ×ËÁ ÎÅ ÕÄÁÌÁÓØ: %s\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:435
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:440
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ÒÁÓÛÉÆÒÏ×ËÁ ÎÅ ÕÄÁÌÁÓØ: %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:459
 #, fuzzy
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "ÚÁÍÅÞÁÎÉÅ: ÏÔÐÒÁ×ÉÔÅÌØ ÚÁÐÒÏÓÉÌ \"ÔÏÌØËÏ-ÄÌÑ-÷ÁÛÉÈ-ÇÌÁÚ\"\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:461
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:632
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:719 g10/mainproc.c:728
 #, fuzzy
 msgid "WARNING: invalid notation data found\n"
 msgstr "ÎÅ ÎÁÊÄÅÎÏ ÄÏÐÕÓÔÉÍÙÈ RFC1991 ÉÌÉ OpenPGP ÄÁÎÎÙÈ.\n"
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:731
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:680
+#: g10/mainproc.c:740
 msgid "Policy: "
 msgstr ""
 
-#: g10/mainproc.c:1121
+#: g10/mainproc.c:1193
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1158
+#. plaintext before signatures but no one-pass packets
+#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#, fuzzy
+msgid "can't handle these multiple signatures\n"
+msgstr "ÓÏÚÄÁÔØ ÏÔÄÅÌØÎÕÀ ÐÏÄÐÉÓØ"
+
+#: g10/mainproc.c:1256
 #, 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:1184 g10/mainproc.c:1195
+#: g10/mainproc.c:1284 g10/mainproc.c:1292
 msgid "BAD signature from \""
 msgstr "ðìïèáñ ÐÏÄÐÉÓØ ÏÔ \""
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1196
+#: g10/mainproc.c:1285 g10/mainproc.c:1293
 msgid "Good signature from \""
 msgstr "èÏÒÏÛÁÑ ÐÏÄÐÉÓØ ÏÔ \""
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr ""
 
-#: g10/mainproc.c:1243
+#: g10/mainproc.c:1358
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ: %s\n"
 
-#: g10/mainproc.c:1318
+#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "ÓÏÚÄÁÔØ ÏÔÄÅÌØÎÕÀ ÐÏÄÐÉÓØ"
+
+#: g10/mainproc.c:1454
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "ðÏÄÐÉÓØ ÎÅÉÚ×ÅÓÔÎÏÇÏ ÔÉÐÁ"
 
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1511
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1518
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, fuzzy, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr ""
 
-#: g10/misc.c:234
-msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
+#: g10/misc.c:238
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
 
 #: g10/parse-packet.c:119
@@ -2826,12 +2848,83 @@
 msgid "can't handle public key algorithm %d\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÂÌÏËÉÒÏ×ÁÔØ Ó×ÑÚËÕ ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ: %s\n"
 
-#: g10/parse-packet.c:991
+#: g10/parse-packet.c:1010
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:159
+#: g10/passphrase.c:223
+msgid "gpg-agent is not available in this session\n"
+msgstr ""
+
+#: g10/passphrase.c:229
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr ""
+
+#: g10/hkp.c:167 g10/passphrase.c:248
+#, fuzzy, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n"
+
+#: g10/passphrase.c:313 g10/passphrase.c:576
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr ""
+
+#: g10/passphrase.c:323
+#, fuzzy, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"\n"
+"÷ÁÍ ÎÕÖÎÁ ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ, ÞÔÏÂÙ ÏÔÏÍËÎÕÔØ ËÌÀÞ\n"
+"ÐÏÌØÚÏ×ÁÔÅÌÑ: \""
+
+#: g10/passphrase.c:344
+#, fuzzy
+msgid "Enter passphrase\n"
+msgstr "÷×ÅÄÉÔÅ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ: %s\n"
+
+#: g10/passphrase.c:346
+#, fuzzy
+msgid "Repeat passphrase\n"
+msgstr "ðÏ×ÔÏÒÉÔÅ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ: %s\n"
+
+# ################################
+# ####### Help msgids ############
+# ################################
+#: g10/passphrase.c:384
+#, fuzzy
+msgid "passphrase too long\n"
+msgstr ""
+"Bitte geben Sie die \"Passhrase\" ein; dies ist ein geheimer Satz der aus\n"
+"beliebigen Zeichen bestehen kann.  Was Sie eingegeben wird nicht angezeigt.\n"
+"Zur ihrer eigenen Sicherbeit benutzen Sie biite einen Satz, den sie sich\n"
+"gut merken könne, der aber nicht leicht zu raten ist; Zitate und andere\n"
+"bekannte Texte sind eine SCHLECHTE Wahl, da diese mit Sicherheit online\n"
+"verfügbar sind und durch entsprechende Programme zum Raten der "
+"\"Passphrase\"\n"
+"benutzt werden.  Sätze mit persönlicher Bedeutung, die auch noch durch\n"
+"falsche Groß-/Kleinschreibung und eingestreute Sonderzeichen verändert "
+"werden,\n"
+"sind i.d.R. eine gute Wahl"
+
+#: g10/passphrase.c:396
+msgid "invalid response from agent\n"
+msgstr ""
+
+#: g10/passphrase.c:405
+msgid "cancelled by user\n"
+msgstr ""
+
+#: g10/passphrase.c:408 g10/passphrase.c:477
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr ""
+
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2841,27 +2934,22 @@
 "÷ÁÍ ÎÕÖÎÁ ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ, ÞÔÏÂÙ ÏÔÏÍËÎÕÔØ ËÌÀÞ\n"
 "ÐÏÌØÚÏ×ÁÔÅÌÑ: \""
 
-#: g10/passphrase.c:168
+#: g10/passphrase.c:571
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "(%u-ÂÉÔ %s ËÌÀÞ, ID %08lX, ÓÏÚÄÁÎ %s)\n"
 
-#: g10/passphrase.c:173
-#, c-format
-msgid " (main key ID %08lX)"
-msgstr ""
-
-#: g10/passphrase.c:190
+#: g10/passphrase.c:609
 #, fuzzy
 msgid "can't query password in batchmode\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÄÅÌÁÔØ ÜÔÏ × ÐÁËÅÔÎÏÍ ÒÅÖÉÍÅ.\n"
 
-#: g10/passphrase.c:194
+#: g10/passphrase.c:613
 #, fuzzy
 msgid "Enter passphrase: "
 msgstr "÷×ÅÄÉÔÅ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ: %s\n"
 
-#: g10/passphrase.c:198
+#: g10/passphrase.c:617
 #, fuzzy
 msgid "Repeat passphrase: "
 msgstr "ðÏ×ÔÏÒÉÔÅ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ: %s\n"
@@ -2870,20 +2958,25 @@
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "ÄÁÎÎÙÅ ÎÅ ÂÙÌÉ ÓÏÈÒÁÎÅÎÙ; ×ÏÓÐÏÌØÚÕÊÔÅÓØ --\"output\" ÄÌÑ ÓÏÈÒÁÎÅÎÉÑ\n"
 
-#: g10/plaintext.c:324
+#: g10/plaintext.c:332
 #, fuzzy
 msgid "Detached signature.\n"
 msgstr "%d ÐÌÏÈÉÈ ÐÏÄÐÉÓÅÊ\n"
 
-#: g10/plaintext.c:328
+#: g10/plaintext.c:336
 msgid "Please enter name of data file: "
 msgstr "ðÏÖÁÌÕÊÓÔÁ, ××ÅÄÉÔÅ ÉÍÑ ÆÁÊÌÁ ÄÁÎÎÙÈ: "
 
-#: g10/plaintext.c:349
+#: g10/plaintext.c:357
 msgid "reading stdin ...\n"
 msgstr ""
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:391
+#, fuzzy
+msgid "no signed data\n"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÐÏÄÐÉÓÁÎÎÙÅ ÄÁÎÎÙÅ `%s' .\n"
+
+#: g10/plaintext.c:399
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÐÏÄÐÉÓÁÎÎÙÅ ÄÁÎÎÙÅ `%s' .\n"
@@ -2918,41 +3011,36 @@
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ËÌÀÞ ÐÏÄÐÉÓÉ ÕÓÔÁÒÅÌ %s\n"
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr ""
 
-#: g10/hkp.c:85
+#: g10/hkp.c:83
 #, fuzzy, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ × Ó×ÑÚËÕ ËÌÀÞÅÊ: %s\n"
 
-#: g10/hkp.c:109 g10/hkp.c:148
+#: g10/hkp.c:102 g10/hkp.c:136
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/hkp.c:117
+#: g10/hkp.c:110
 #, fuzzy, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ËÏÍÍÅÎÔÁÒÉÉ.\n"
 
-#: g10/hkp.c:170
-#, fuzzy, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n"
-
-#: g10/hkp.c:194
+#: g10/hkp.c:191
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:203
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:209
+#: g10/hkp.c:206
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
@@ -2995,31 +3083,36 @@
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÐÏÄÐÉÓÉ\n"
 
-#: g10/sig-check.c:324
+#: g10/sig-check.c:328
 #, fuzzy, c-format
-msgid "NOTE: signature key expired %s\n"
+msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ËÌÀÞ ÐÏÄÐÉÓÉ ÕÓÔÁÒÅÌ %s\n"
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sign.c:140
+#: g10/sign.c:152
+#, fuzzy, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "ËÌÀÞ %08lX.%lu: ×ÓÔÁ×ËÁ ÄÏ×ÅÒÉÔÅÌØÎÏÊ ÚÁÐÉÓÉ ÎÅ ÕÄÁÌÁÓØ: %s\n"
+
+#: g10/sign.c:161
 #, fuzzy, c-format
 msgid "%s signature from: %s\n"
 msgstr "ðìïèáñ ÐÏÄÐÉÓØ ÏÔ \""
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:307 g10/sign.c:630
 #, fuzzy, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:405
 #, fuzzy
 msgid "signing:"
 msgstr "ÐÏÄÐÉÓÁÔØ"
 
-#: g10/sign.c:431
+#: g10/sign.c:448
 #, fuzzy, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÕÓÔÏÊ ÆÁÊÌ.\n"
@@ -3058,7 +3151,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
+#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
 #, fuzzy, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n"
@@ -3239,11 +3332,6 @@
 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"
@@ -3462,14 +3550,14 @@
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr ""
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
@@ -3479,39 +3567,48 @@
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1374
+#: g10/ringedit.c:319 g10/ringedit.c:1376
 #, fuzzy, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n"
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1557
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1558
 #, fuzzy, c-format
 msgid "%s is the unchanged one\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎ ÎÅÐÒÁ×ÉÌØÎÙÊ ÓÅËÒÅÔÎÙÊ ËÌÀÞ"
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1559
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1560
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, fuzzy, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "%s: ÐÒÏÐÕÝÅÎ: %s\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, fuzzy, c-format
 msgid "skipped `%s': %s\n"
 msgstr "%s: ÐÒÏÐÕÝÅÎ: %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+msgid "skipped: secret key already present\n"
+msgstr ""
+
+#: g10/skclist.c:160
 #, fuzzy, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3538,32 +3635,32 @@
 msgid "Enter new filename"
 msgstr "--store [ÉÍÑ ÆÁÊÌÁ]"
 
-#: g10/openfile.c:182
+#: g10/openfile.c:184
 #, fuzzy
 msgid "writing to stdout\n"
 msgstr "ÚÁÐÉÓÙ×ÁÅÔÓÑ × `%s'\n"
 
-#: g10/openfile.c:261
+#: g10/openfile.c:273
 #, fuzzy, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÐÏÄÐÉÓÁÎÎÙÅ ÄÁÎÎÙÅ `%s' .\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:323
 #, c-format
 msgid "%s: new options file created\n"
 msgstr ""
 
-#: g10/openfile.c:338
+#: g10/openfile.c:350
 #, fuzzy, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n"
 
-#: g10/openfile.c:341
+#: g10/openfile.c:353
 #, fuzzy, c-format
 msgid "%s: directory created\n"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n"
 
-#: g10/openfile.c:343
+#: g10/openfile.c:355
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 
@@ -3585,6 +3682,11 @@
 "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÓÏÏÂÝÅÎÉÅ ÂÙÌÏ ÚÁÛÉÆÒÏ×ÁÎÏ, ÉÓÐÏÌØÚÕÑ ÓÌÁÂÙÊ ËÌÀÞ, × "
 "ÓÉÍÍÅÔÒÉÞÎÏÍ ÁÌÇÏÒÉÔÍÅ ÛÉÆÒÏ×ÁÎÉÑ.\n"
 
+#: g10/encr-data.c:97
+#, fuzzy
+msgid "problem handling encrypted packet\n"
+msgstr "×ÙÂÒÁÓÙ×ÁÔØ ÐÏÌÅ keyid Õ ÚÁÛÉÆÒÏ×ÁÎÎÙÈ ÐÁËÅÔÏ×"
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "ÐÏÌÕÞÉÌÓÑ ÓÌÁÂÙÊ ËÌÀÞ, ÐÒÏÂÕÅÍ ÅÝÅ ÒÁÚ\n"
@@ -3596,16 +3698,6 @@
 "ÎÅ ÐÏÌÕÞÁÅÔÓÑ ÉÚÂÅÖÁÔØ ÓÌÁÂÏÇÏ ËÌÀÞÁ × ÓÉÍÍÅÔÒÉÞÎÏÍ ÁÌÇÏÒÉÔÍÅ; ÐÒÏÂÏ×ÁÌÉ %d "
 "ÒÁÚ!\n"
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "Es gibt einen privaten ËÌÀÞ zu diesem öffentlichen ËÌÀÞ!\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr ""
-"Benutzen Sie das Kommando \"--delete-secret-key\", um ihn vorab zu "
-"entfernen.\n"
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "Dies kann im Batchmodus ohne \"--yes\" nicht durchgeführt werden.\n"
@@ -3618,6 +3710,16 @@
 msgid "This is a secret key! - really delete? "
 msgstr "Dies ist ein privater ËÌÀÞ! - Wirklich löschen? "
 
+#: g10/delkey.c:181
+msgid "there is a secret key for this public key!\n"
+msgstr "Es gibt einen privaten ËÌÀÞ zu diesem öffentlichen ËÌÀÞ!\n"
+
+#: g10/delkey.c:183
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr ""
+"Benutzen Sie das Kommando \"--delete-secret-key\", um ihn vorab zu "
+"entfernen.\n"
+
 #: g10/helptext.c:47
 #, fuzzy
 msgid ""
@@ -3816,6 +3918,26 @@
 msgid "No help available for `%s'"
 msgstr "ðÏÍÏÝØ ÄÌÑ `%s' ÏÔÓÕÔÓÔ×ÕÅÔ."
 
+#, fuzzy
+#~ msgid "invalid"
+#~ msgstr "îÅÄÏÐÕÓÔÉÍÁÑ ASCII-ËÏÄÉÒÏ×ËÁ"
+
+#, fuzzy
+#~ msgid "revoked"
+#~ msgstr "ËÌÀÞ"
+
+#, fuzzy
+#~ msgid "No key for user ID\n"
+#~ msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ\n"
+
+#, fuzzy
+#~ msgid "No user ID for key\n"
+#~ msgstr "ðÌÏÈÏÊ ÓÅËÒÅÔÎÙÊ ËÌÀÞ"
+
+#, fuzzy
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "óÅËÒÅÔÎÙÊ ËÌÀÞ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
+
 #~ msgid ""
 #~ "RSA keys are deprecated; please consider creating a new key and use this key "
 #~ "in the future\n"
@@ -3845,23 +3967,6 @@
 #~ msgstr ""
 #~ "çÅÎÅÒÁÃÉÑ ËÌÀÞÁ ÍÏÖÅÔ ÂÙÔØ ×ÙÐÏÌÎÅÎÁ ÔÏÌØËÏ × ÉÎÔÅÒÁËÔÉ×ÎÏÍ ÒÅÖÉÍÅ.\n"
 
-# ################################
-# ####### Help msgids ############
-# ################################
-#~ msgid "passphrase.enter"
-#~ msgstr ""
-#~ "Bitte geben Sie die \"Passhrase\" ein; dies ist ein geheimer Satz der aus\n"
-#~ "beliebigen Zeichen bestehen kann.  Was Sie eingegeben wird nicht angezeigt.\n"
-#~ "Zur ihrer eigenen Sicherbeit benutzen Sie biite einen Satz, den sie sich\n"
-#~ "gut merken könne, der aber nicht leicht zu raten ist; Zitate und andere\n"
-#~ "bekannte Texte sind eine SCHLECHTE Wahl, da diese mit Sicherheit online\n"
-#~ "verfügbar sind und durch entsprechende Programme zum Raten der "
-#~ "\"Passphrase\"\n"
-#~ "benutzt werden.  Sätze mit persönlicher Bedeutung, die auch noch durch\n"
-#~ "falsche Groß-/Kleinschreibung und eingestreute Sonderzeichen verändert "
-#~ "werden,\n"
-#~ "sind i.d.R. eine gute Wahl"
-
 #~ msgid "passphrase.repeat"
 #~ msgstr ""
 #~ "Um sicher zu gehen, daß Sie sich bei der Eingabe der \"Passphrase\" nicht\n"
@@ -3981,10 +4086,6 @@
 
 #, fuzzy
 #~ msgid "lid %lu: read pref record failed: %s\n"
-#~ msgstr "ËÌÀÞ %08lX.%lu: ×ÓÔÁ×ËÁ ÄÏ×ÅÒÉÔÅÌØÎÏÊ ÚÁÐÉÓÉ ÎÅ ÕÄÁÌÁÓØ: %s\n"
-
-#, fuzzy
-#~ msgid "lid %lu: read sig record failed: %s\n"
 #~ msgstr "ËÌÀÞ %08lX.%lu: ×ÓÔÁ×ËÁ ÄÏ×ÅÒÉÔÅÌØÎÏÊ ÚÁÐÉÓÉ ÎÅ ÕÄÁÌÁÓØ: %s\n"
 
 #, fuzzy
diff -urN gnupg-1.0.4/po/sv.po gnupg-1.0.5/po/sv.po
--- gnupg-1.0.4/po/sv.po	Tue Oct 17 15:40:41 2000
+++ gnupg-1.0.5/po/sv.po	Sun Apr 29 16:39:31 2001
@@ -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.17 2000/10/17 13:30:26 wkoch Exp $
+# $Id: sv.po,v 1.1.2.31 2001/04/29 14:08:26 werner Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1e\n"
-"POT-Creation-Date: 2000-10-16 19:22+0200\n"
+"POT-Creation-Date: 2001-04-29 16:39+0200\n"
 "PO-Revision-Date: 2000-04-23 16:43+02:00\n"
 "Last-Translator: Daniel Resare <daniel@resare.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -25,35 +25,35 @@
 msgid "Warning: using insecure memory!\n"
 msgstr "Varning: använder osäkert minne!\n"
 
-#: util/secmem.c:295
+#: util/secmem.c:299
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operationen är ej möjlig utan tillgång till säkert minne\n"
 
-#: util/secmem.c:296
+#: util/secmem.c:300
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan ha använt fel program för denna uppgift)\n"
 
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:287 util/miscutil.c:316
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:288 util/miscutil.c:319
 msgid "yY"
 msgstr "jJ"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:289 util/miscutil.c:317
 msgid "no"
 msgstr "nej"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:290 util/miscutil.c:320
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:318
 msgid "quit"
 msgstr "avsluta"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:321
 msgid "qQ"
 msgstr "aA"
 
@@ -258,6 +258,17 @@
 msgid "not processed"
 msgstr "inte behandlade"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "felaktig publik nyckel"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "felaktig hemlig nyckel"
+
 #: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -268,63 +279,63 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du har hittat en bugg ... (%s:%d)\\n\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:324
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan inte ta status på \"%s\": %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:329
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "\"%s\" är inte än vanlig fil - ignorerad\n"
 
-#: cipher/random.c:325
+#: cipher/random.c:334
 msgid "note: random_seed file is empty\n"
 msgstr "notera: filen random_seed är tom\n"
 
-#: cipher/random.c:331
+#: cipher/random.c:340
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr "varning: random_seed har en felaktig storlek och används därför inte\n"
 
-#: cipher/random.c:339
+#: cipher/random.c:348
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan inte läsa \"%s\": %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:386
 msgid "note: random_seed file not updated\n"
 msgstr "notera: random_seed uppdaterades inte\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:406
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:413
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan inte skriva till \"%s\": %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:416
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan inte stänga \"%s\": %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:427
 #, c-format
 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:650
+#: cipher/random.c:661
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VARNING: använder en osäker slumptalsgenerator!!\n"
 
-#: cipher/random.c:651
+#: cipher/random.c:662
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -351,7 +362,7 @@
 "en stund för att ge operativsystemet en chans att samla mer entropi!\n"
 "(Behöver %d fler byte)\n"
 
-#: g10/g10.c:206
+#: g10/g10.c:216
 msgid ""
 "@Commands:\n"
 " "
@@ -359,139 +370,139 @@
 "@Kommandon:\n"
 " "
 
-#: g10/g10.c:208
+#: g10/g10.c:218
 msgid "|[file]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: g10/g10.c:209
+#: g10/g10.c:219
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartext-signatur"
 
-#: g10/g10.c:210
+#: g10/g10.c:220
 msgid "make a detached signature"
 msgstr "skapa en signatur i en separat fil"
 
-#: g10/g10.c:211
+#: g10/g10.c:221
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/g10.c:212
+#: g10/g10.c:222
 msgid "encryption only with symmetric cipher"
 msgstr "endast kryptering med symmetriskt chiffer"
 
-#: g10/g10.c:213
+#: g10/g10.c:223
 msgid "store only"
 msgstr "endast lagring"
 
-#: g10/g10.c:214
+#: g10/g10.c:224
 msgid "decrypt data (default)"
 msgstr "dekryptera data (normalläge)"
 
-#: g10/g10.c:215
+#: g10/g10.c:225
 msgid "verify a signature"
 msgstr "verifiera en signatur"
 
-#: g10/g10.c:217
+#: g10/g10.c:227
 msgid "list keys"
 msgstr "räkna upp nycklar"
 
-#: g10/g10.c:219
+#: g10/g10.c:229
 msgid "list keys and signatures"
 msgstr "räkna upp nycklar och signaturer"
 
-#: g10/g10.c:220
+#: g10/g10.c:230
 msgid "check key signatures"
 msgstr "verifiera nyckelsignaturer"
 
-#: g10/g10.c:221
+#: g10/g10.c:231
 msgid "list keys and fingerprints"
 msgstr "räkna upp nycklar och fingeravtryck"
 
-#: g10/g10.c:222
+#: g10/g10.c:232
 msgid "list secret keys"
 msgstr "räkna upp hemliga nycklar"
 
-#: g10/g10.c:223
+#: g10/g10.c:233
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/g10.c:224
+#: g10/g10.c:234
 msgid "remove key from the public keyring"
 msgstr "ta bort en nyckel från den publika nyckelringen"
 
-#: g10/g10.c:226
+#: g10/g10.c:236
 msgid "remove key from the secret keyring"
 msgstr "ta bort en nyckel från den hemliga nyckelringen"
 
-#: g10/g10.c:227
+#: g10/g10.c:237
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/g10.c:228
+#: g10/g10.c:238
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/g10.c:229
+#: g10/g10.c:239
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/g10.c:230
+#: g10/g10.c:240
 msgid "generate a revocation certificate"
 msgstr "generera ett återkallelesecertifikat"
 
-#: g10/g10.c:231
+#: g10/g10.c:241
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/g10.c:232
+#: g10/g10.c:242
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/g10.c:233
+#: g10/g10.c:243
 msgid "import keys from a key server"
 msgstr "importera nycklar från en nyckelserver"
 
-#: g10/g10.c:237
+#: g10/g10.c:247
 msgid "import/merge keys"
 msgstr "importera/slå ihop nycklar"
 
-#: g10/g10.c:239
+#: g10/g10.c:249
 msgid "list only the sequence of packets"
 msgstr "skriv endast ut paketsekvensen"
 
-#: g10/g10.c:241
+#: g10/g10.c:251
 msgid "export the ownertrust values"
 msgstr "exportera de värden som representerar ägartillit"
 
-#: g10/g10.c:243
+#: g10/g10.c:253
 msgid "import ownertrust values"
 msgstr "importera värden som representerar ägartillit"
 
-#: g10/g10.c:245
+#: g10/g10.c:255
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/g10.c:247
+#: g10/g10.c:257
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMN]|kontrollera tillitsdatabasen"
 
-#: g10/g10.c:248
+#: g10/g10.c:258
 msgid "fix a corrupted trust database"
 msgstr "reparera en korrupt tillitsdatabas"
 
-#: g10/g10.c:249
+#: g10/g10.c:259
 msgid "De-Armor a file or stdin"
 msgstr "Skala av en fil eller standard in"
 
-#: g10/g10.c:251
+#: g10/g10.c:261
 msgid "En-Armor a file or stdin"
 msgstr "Skapa ett skal för en fil eller standard in"
 
-#: g10/g10.c:253
+#: g10/g10.c:263
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
-#: g10/g10.c:257
+#: g10/g10.c:267
 msgid ""
 "@\n"
 "Options:\n"
@@ -501,152 +512,156 @@
 "Flaggor:\n"
 " "
 
-#: g10/g10.c:259
+#: g10/g10.c:269
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/g10.c:261
+#: g10/g10.c:271
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera för NAMN"
 
-#: g10/g10.c:264
+#: g10/g10.c:274
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMN|använd NAMN som standardvärdet för mottagare"
 
-#: g10/g10.c:266
+#: g10/g10.c:276
 msgid "use the default key as default recipient"
 msgstr "använd standardnyckeln som standardmottagare"
 
-#: g10/g10.c:270
+#: g10/g10.c:280
 msgid "use this user-id to sign or decrypt"
 msgstr "använd denna användaridentitet för att signera eller dekryptera"
 
-#: g10/g10.c:271
+#: g10/g10.c:281
 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:273
+#: g10/g10.c:283
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: g10/g10.c:274
+#: g10/g10.c:284
 msgid "use as output file"
 msgstr "använd som fil för utdata"
 
-#: g10/g10.c:275
+#: g10/g10.c:285
 msgid "verbose"
 msgstr "utförlig"
 
-#: g10/g10.c:276
+#: g10/g10.c:286
 msgid "be somewhat more quiet"
 msgstr "var något tystare"
 
-#: g10/g10.c:277
+#: g10/g10.c:287
 msgid "don't use the terminal at all"
 msgstr "använd inte terminalen alls"
 
-#: g10/g10.c:278
+#: g10/g10.c:288
 msgid "force v3 signatures"
 msgstr "använd v3-signaturer"
 
-#: g10/g10.c:279
+#: g10/g10.c:289
 msgid "always use a MDC for encryption"
 msgstr "använd alltid en MDC för kryptering"
 
-#: g10/g10.c:280
+#: g10/g10.c:290
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:282
+#: g10/g10.c:292
+msgid "use the gpg-agent"
+msgstr ""
+
+#: g10/g10.c:293
 msgid "batch mode: never ask"
 msgstr "batch-läge: fråga aldrig"
 
-#: g10/g10.c:283
+#: g10/g10.c:294
 msgid "assume yes on most questions"
 msgstr "anta att svaret är ja på de flesta frågor"
 
-#: g10/g10.c:284
+#: g10/g10.c:295
 msgid "assume no on most questions"
 msgstr "anta att svaret är nej på de flesta frågor"
 
-#: g10/g10.c:285
+#: g10/g10.c:296
 msgid "add this keyring to the list of keyrings"
 msgstr "lägg till denna nyckelring till listan av nyckelringar"
 
-#: g10/g10.c:286
+#: g10/g10.c:297
 msgid "add this secret keyring to the list"
 msgstr "lägg till denna hemliga nyckelring till listan"
 
-#: g10/g10.c:287
+#: g10/g10.c:298
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
 
-#: g10/g10.c:288
+#: g10/g10.c:299
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|VÄRD|använd denna nyckelserver för att slå upp nycklar"
 
-#: g10/g10.c:289
+#: g10/g10.c:300
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMN|sätt teckentabellen för terminalen till NAMN"
 
-#: g10/g10.c:290
+#: g10/g10.c:301
 msgid "read options from file"
 msgstr "läs flaggor från fil"
 
-#: g10/g10.c:294
+#: g10/g10.c:305
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: g10/g10.c:299
+#: g10/g10.c:310
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:300
+#: g10/g10.c:311
 msgid "|FILE|load extension module FILE"
 msgstr "|FIL|ladda tilläggsmodul FIL"
 
-#: g10/g10.c:301
+#: g10/g10.c:312
 msgid "emulate the mode described in RFC1991"
 msgstr "imitera läget som beskrivs i RFC1991"
 
-#: g10/g10.c:302
+#: g10/g10.c:313
 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:303
+#: g10/g10.c:314
 msgid "|N|use passphrase mode N"
 msgstr "|N|använd lösenordsläget N"
 
-#: g10/g10.c:305
+#: g10/g10.c:316
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMN|använd kontrollsummealgoritmen NAMN för lösenordsfraser"
 
-#: g10/g10.c:307
+#: g10/g10.c:318
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMN|använd chifferalgoritmen NAMN för lösenordsfraser"
 
-#: g10/g10.c:308
+#: g10/g10.c:319
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMN|använd chifferalgoritmen NAMN"
 
-#: g10/g10.c:309
+#: g10/g10.c:320
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMN|använd kontrollsummealgoritmen NAMN"
 
-#: g10/g10.c:310
+#: g10/g10.c:321
 msgid "|N|use compress algorithm N"
 msgstr "|N|använd komprimeringsalgoritmen N"
 
-#: g10/g10.c:311
+#: g10/g10.c:322
 msgid "throw keyid field of encrypted packets"
 msgstr "släng bort nyckelidentitetsfältet från krypterade paket"
 
-#: g10/g10.c:312
+#: g10/g10.c:323
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAMN=VÄRDE|använd detta sätt för att beskriva data"
 
-#: g10/g10.c:315
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -654,7 +669,7 @@
 "@\n"
 "(Se manualsidan för en komplett lista på alla kommandon och flaggor)\n"
 
-#: g10/g10.c:318
+#: g10/g10.c:329
 msgid ""
 "@\n"
 "Examples:\n"
@@ -674,17 +689,17 @@
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/g10.c:418
+#: g10/g10.c:438
 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:422
+#: g10/g10.c:442
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
-#: g10/g10.c:425
+#: g10/g10.c:445
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -694,7 +709,7 @@
 "signera, kontrollera, kryptera eller dekryptera\n"
 "vilken operation som utförs beror på programmets indata\n"
 
-#: g10/g10.c:432
+#: g10/g10.c:452
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -702,66 +717,66 @@
 "\n"
 "Stödda algoritmer:\n"
 
-#: g10/g10.c:511
+#: g10/g10.c:531
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: g10/g10.c:564
+#: g10/g10.c:584
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
-#: g10/g10.c:704
+#: g10/g10.c:734
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTERA: inställningsfilen \"%s\" saknas\n"
 
-#: g10/g10.c:708
+#: g10/g10.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: g10/g10.c:715
+#: g10/g10.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser flaggor från \"%s\"\n"
 
-#: g10/g10.c:905
+#: g10/g10.c:950
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/g10.c:970
+#: g10/g10.c:1024
 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
+#: g10/g10.c:1028 g10/g10.c:1037
 #, 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:976
+#: g10/g10.c:1030
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/g10.c:979
+#: g10/g10.c:1033
 #, 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:998 g10/g10.c:1010
+#: g10/g10.c:1053 g10/g10.c:1065
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: g10/g10.c:1004 g10/g10.c:1016
+#: g10/g10.c:1059 g10/g10.c:1071
 msgid "selected digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen är ogiltig\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1075
 msgid "the given policy URL is invalid\n"
 msgstr "angiven URL är ogiltig\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1078
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "kompressionsalgoritmen måste vara i intervallet %d..%d\n"
@@ -772,127 +787,132 @@
 # ä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:1025
+#: g10/g10.c:1080
 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:1027
+#: g10/g10.c:1082
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" måste vara större än 1\n"
 
-#: g10/g10.c:1029
+#: g10/g10.c:1084
 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:1032
+#: g10/g10.c:1087
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTERA: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/g10.c:1036
+#: g10/g10.c:1091
 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:1121
+#: g10/g10.c:1176
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/g10.c:1127
+#: g10/g10.c:1182
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/g10.c:1134
+#: g10/g10.c:1189
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/g10.c:1142
+#: g10/g10.c:1197
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1210
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1223
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1237
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/g10.c:1199
+#: g10/g10.c:1254
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1262
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1270
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1278
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/g10.c:1239
+#: g10/g10.c:1294
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key användaridentitet"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1297
 msgid "--delete-key user-id"
 msgstr "--delete-key användaridentitet"
 
+#: g10/g10.c:1305
+#, fuzzy
+msgid "--delete-secret-and-public-key user-id"
+msgstr "--delete-secret-key användaridentitet"
+
 # Filnamn både med och utan fnuttar finns. lite ologiskt. Vill någon
 # fixa en patch?
-#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan inte öppna %s: %s\n"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1357
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [användaridentitet] [nyckelring]"
 
-#: g10/g10.c:1360
+#: g10/g10.c:1423
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort skalet: %s\n"
 
-#: g10/g10.c:1368
+#: g10/g10.c:1431
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa skal: %s\n"
 
-#: g10/g10.c:1439
+#: g10/g10.c:1502
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "felaktig hash-algoritm \"%s\"\n"
 
-#: g10/g10.c:1520
+#: g10/g10.c:1589
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/g10.c:1524
+#: g10/g10.c:1593
 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:1527 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
 
-#: g10/g10.c:1737
+#: g10/g10.c:1805
 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:1743
+#: g10/g10.c:1811
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -900,87 +920,87 @@
 "ett notationsnamn kan bara innehålla bokstäver, siffror, punkter eller\n"
 "understrykningstecken och sluta med ett likhetstecken\n"
 
-#: g10/g10.c:1749
+#: g10/g10.c:1817
 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:1757
+#: g10/g10.c:1825
 msgid "a notation value must not use any control characters\n"
 msgstr "ett notationsvärde får inte inehålla några kontrolltecken\n"
 
-#: g10/armor.c:302
+#: g10/armor.c:306
 #, c-format
 msgid "armor: %s\n"
 msgstr "skal: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:335
 msgid "invalid armor header: "
 msgstr "felaktig rubrikrad i skalet: "
 
-#: g10/armor.c:338
+#: g10/armor.c:342
 msgid "armor header: "
 msgstr "rad i skalet: "
 
-#: g10/armor.c:349
+#: g10/armor.c:353
 msgid "invalid clearsig header\n"
 msgstr "felaktig rubrikrad i klartextsignatur\n"
 
-#: g10/armor.c:401
+#: g10/armor.c:405
 msgid "nested clear text signatures\n"
 msgstr "flera klartextsignaturer går in i varandra\n"
 
-#: g10/armor.c:525
+#: g10/armor.c:529
 msgid "invalid dash escaped line: "
 msgstr "felaktig bindestreck-kodad rad: "
 
-#: g10/armor.c:537
+#: g10/armor.c:541
 msgid "unexpected armor:"
 msgstr "oväntat skal:"
 
-#: g10/armor.c:654
+#: g10/armor.c:667 g10/armor.c:1235
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ogiltigt radix64-tecken %02x hoppades över\n"
 
-#: g10/armor.c:697
+#: g10/armor.c:710
 msgid "premature eof (no CRC)\n"
 msgstr "för tidigt filslut (ingen CRC-summa)\n"
 
-#: g10/armor.c:731
+#: g10/armor.c:744
 msgid "premature eof (in CRC)\n"
 msgstr "för tidigt filslut (i CRC-summan)\n"
 
-#: g10/armor.c:735
+#: g10/armor.c:748
 msgid "malformed CRC\n"
 msgstr "felformaterad CRC-summa\n"
 
-#: g10/armor.c:739
+#: g10/armor.c:752 g10/armor.c:1272
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "CRC-fel; %06lx - %06lx\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:772
 msgid "premature eof (in Trailer)\n"
 msgstr "för tidigt filslut (i den avslutande raden)\n"
 
-#: g10/armor.c:760
+#: g10/armor.c:776
 msgid "error in trailer line\n"
 msgstr "fel i avslutande rad\n"
 
-#: g10/armor.c:906
+#: g10/armor.c:922
 msgid "For info see http://www.gnupg.org"
 msgstr "För information se http://www.gnupg.org/"
 
-#: g10/armor.c:1027
+#: g10/armor.c:1050
 msgid "no valid OpenPGP data found.\n"
 msgstr "hittade ingen giltig OpenPGP-data.\n"
 
-#: g10/armor.c:1032
+#: g10/armor.c:1055
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "felaktigt skal: raden är längre än %d tecken\n"
 
-#: g10/armor.c:1036
+#: g10/armor.c:1059
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -990,7 +1010,7 @@
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "           Fingeravtryck:"
 
@@ -1225,59 +1245,59 @@
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det är inte säkert att signaturen tillhör ägaren.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: %s överhoppad\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: hoppade över: publik nyckel finns redan\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
 msgstr "Du specificerade ingen användaridentitet. (du kan använda \"-r\")\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "Ange användaridentiteten: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "Hittade inte användaridentiteten.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "hoppade över: den publika nyckeln är redan satt som förvald mottagare\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
 msgstr "Den publika nyckeln är deaktiverad\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "hoppade över: publik nyckel är redan angiven med --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "den förvalda mottagaren \"%s\" är okänd\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: fel vid kontroll av nyckeln: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: hoppade över: den publika nyckeln är deaktiverad\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "inga giltiga adresser\n"
 
@@ -1285,62 +1305,66 @@
 msgid "writing self signature\n"
 msgstr "skriver självsignatur\n"
 
-#: g10/keygen.c:214
+#: g10/keygen.c:217
 msgid "writing key binding signature\n"
 msgstr "skriver signatur knuten till nyckeln\n"
 
-#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
+#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
 
-#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
+#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:549
 msgid "Please select what kind of key you want:\n"
 msgstr "Välj vilken typ av nyckel du vill ha:\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:551
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA och ElGamal (standardvalet)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:552
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:554
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (endast kryptering)\n"
 
-#: g10/keygen.c:546
+#: g10/keygen.c:555
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signering och kryptering)\n"
 
-#: g10/keygen.c:548
+#: g10/keygen.c:557
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signering och kryptering)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:561
 msgid "Your selection? "
 msgstr "Vad väljer du? "
 
-#: g10/keygen.c:563 g10/keygen.c:571
+#: g10/keygen.c:572
 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:585
+#: g10/keygen.c:580
+msgid "The use of this algorithm is deprecated - create anyway? "
+msgstr ""
+
+#: g10/keygen.c:594
 msgid "Invalid selection.\n"
 msgstr "Felaktigt val.\n"
 
-#: g10/keygen.c:597
+#: g10/keygen.c:606
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1353,19 +1377,19 @@
 "              den förvalda nyckelstorleken är 1024 bitar\n"
 "    den största föreslagna nyckelstorleken är 2048 bitar\n"
 
-#: g10/keygen.c:604
+#: g10/keygen.c:613
 msgid "What keysize do you want? (1024) "
 msgstr "Vilken nyckelstorlek vill du ha? (1024) "
 
-#: g10/keygen.c:609
+#: g10/keygen.c:618
 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:611
+#: g10/keygen.c:620
 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:613
+#: g10/keygen.c:622
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "nyckelstorleken är för liten; 768 är det minst tillåtna värdet.\n"
@@ -1378,12 +1402,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:624
+#: g10/keygen.c:633
 #, 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:629
+#: g10/keygen.c:638
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1391,11 +1415,11 @@
 "Nyckelstorlekar större än 2048 är inte att rekommendera\n"
 "eftersom beräkningar tar MYCKET lång tid!\n"
 
-#: g10/keygen.c:632
+#: g10/keygen.c:641
 msgid "Are you sure that you want this keysize? "
 msgstr "Är du säker på att du vill ha denna nyckelstorlek? "
 
-#: g10/keygen.c:633
+#: g10/keygen.c:642
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1403,22 +1427,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:641
+#: g10/keygen.c:650
 msgid "Do you really need such a large keysize? "
 msgstr "Behöver du verkligen en så stor nyckelstorlek? "
 
-#: g10/keygen.c:647
+#: g10/keygen.c:656
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
 
-#: g10/keygen.c:650 g10/keygen.c:654
+#: g10/keygen.c:659 g10/keygen.c:663
 #, 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:702
+#: g10/keygen.c:711
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1434,25 +1458,25 @@
 "      <n>m = nyckeln blir ogiltig efter n månader\n"
 "      <n>y = nyckeln blir ogiltig efter n år\n"
 
-#: g10/keygen.c:717
+#: g10/keygen.c:726
 msgid "Key is valid for? (0) "
 msgstr "För hur lång tid är nyckeln giltig? (0) "
 
-#: g10/keygen.c:722
+#: g10/keygen.c:731
 msgid "invalid value\n"
 msgstr "ogiltigt värde\n"
 
-#: g10/keygen.c:727
+#: g10/keygen.c:736
 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:733
+#: g10/keygen.c:742
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nyckeln går ut vid följande tidpunkt: %s\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:745
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1460,11 +1484,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:741
+#: g10/keygen.c:750
 msgid "Is this correct (y/n)? "
 msgstr "Stämmer detta (j/n)? "
 
-#: g10/keygen.c:784
+#: g10/keygen.c:793
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1480,44 +1504,44 @@
 "     \"Gustav Vasa (Brutal kung) <gustav@trekronor.se>\"\n"
 "\n"
 
-#: g10/keygen.c:796
+#: g10/keygen.c:805
 msgid "Real name: "
 msgstr "Namn: "
 
-#: g10/keygen.c:804
+#: g10/keygen.c:813
 msgid "Invalid character in name\n"
 msgstr "Ogiltigt tecken i namnet\n"
 
-#: g10/keygen.c:806
+#: g10/keygen.c:815
 msgid "Name may not start with a digit\n"
 msgstr "Namnet får inte börja med en siffra\n"
 
-#: g10/keygen.c:808
+#: g10/keygen.c:817
 msgid "Name must be at least 5 characters long\n"
 msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
 
-#: g10/keygen.c:816
+#: g10/keygen.c:825
 msgid "Email address: "
 msgstr "Epostadress: "
 
-#: g10/keygen.c:827
+#: g10/keygen.c:836
 msgid "Not a valid email address\n"
 msgstr "Epostadressen är ogiltig\n"
 
-#: g10/keygen.c:835
+#: g10/keygen.c:844
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:841
+#: g10/keygen.c:850
 msgid "Invalid character in comment\n"
 msgstr "Ogiltigt tecken i kommentaren\n"
 
-#: g10/keygen.c:864
+#: g10/keygen.c:873
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du använder teckenuppsättningen \"%s\"\n"
 
-#: g10/keygen.c:870
+#: g10/keygen.c:879
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1528,28 +1552,28 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:883
 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:879
+#: g10/keygen.c:888
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: g10/keygen.c:889
+#: g10/keygen.c:898
 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:890
+#: g10/keygen.c:899
 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:909
+#: g10/keygen.c:918
 msgid "Please correct the error first\n"
 msgstr "Rätta först felet\n"
 
 # fel kapitalisering i originalet?
-#: g10/keygen.c:947
+#: g10/keygen.c:956
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1557,11 +1581,11 @@
 "Du behöver en lösenordsfras för att skydda din hemliga nyckel\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:964
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "lösenordsfrasen upprepades ej korrekt; försök igen.\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:970
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1572,7 +1596,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:982
+#: g10/keygen.c:991
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1584,29 +1608,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:1431
+#: g10/keygen.c:1440
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA-nyckelparet kommer att ha 1024 bitar.\n"
 
-#: g10/keygen.c:1474
+#: g10/keygen.c:1483
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbröts.\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1581
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver publik nyckel till \"%s\"\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1582
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1679
 msgid "public and secret key created and signed.\n"
 msgstr "publik och hemlig nyckel skapad och signerad.\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1684
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1615,13 +1639,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:1690 g10/keygen.c:1791
+#: g10/keygen.c:1701 g10/keygen.c:1807
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format behövs inte i singularis
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1748 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1629,7 +1653,7 @@
 "nyckeln är skapad %lu sekund in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1750 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1637,11 +1661,11 @@
 "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1783
 msgid "Really create? "
 msgstr "Vill du verkligen skapa? "
 
-#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1652,17 +1676,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr "fel vid skapandet av lösenordsfras: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: VARNING: tom fil\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "läser från \"%s\"\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s krypterad för: %s\n"
@@ -1687,283 +1711,283 @@
 msgid "key %08lX: not protected - skipped\n"
 msgstr "nyckeln %08lX är inte skyddad - överhoppad\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr "VARNING: exporterade ingenting\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:214
 msgid "too many entries in pk cache - disabled\n"
 msgstr "för många poster i pk-cachen - inaktiverad\n"
 
-#: g10/getkey.c:350
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+#, fuzzy
+msgid "[User id not found]"
+msgstr "%s: hittade inte användaren\n"
+
+#: g10/getkey.c:453
 msgid "too many entries in unk cache - disabled\n"
 msgstr "för många poster i unk-cachen - inaktiverad\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr "det går inte att använda RSA-nycklar i denna version\n"
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
-msgstr "Ingen nyckel för användaridentiteten\n"
-
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
-msgstr "Inget användarid för nyckel\n"
-
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2207
 #, 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:2050
-#, fuzzy
-msgid "[User id not found]"
-msgstr "%s: hittade inte användaren\n"
+#: g10/getkey.c:2249 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/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "hoppar över block av typen %d\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 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:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "  Totalt antal behandlade enheter: %lu\n"
 
-#: g10/import.c:206
+#: g10/import.c:208
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "                 nya undernycklar: %lu\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         utan användaridentiteter: %lu\n"
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      importerade: %lu"
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                      oförändrade: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          nya användaridentiteter: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                 nya undernycklar: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                   nya signaturer: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "     nya återkallelser av nycklar: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      antal lästa hemliga nycklar: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "antal importerade hemliga nycklar: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "antal oförändrade hemliga nycklar: %lu\n"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "nyckel %08lX: ingen användaridentitet\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "nyckel %08lX: inga giltiga användaridentiteter\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 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:418 g10/import.c:657
+#: g10/import.c:435 g10/import.c:684
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "nyckel %08lX: hittade ingen publik nyckel: %s\n"
 
-#: g10/import.c:423
+#: g10/import.c:440
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "nyckeln %08lX följer inte standarden RFC2440 - överhoppad\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "ingen förvald publik nyckel\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "kan inte låsa nyckelringen \"%s\": %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "nyckel %08lX: importerade publik nyckel\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "nyckel %08lX: matchar inte vår lokala kopia\n"
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:489 g10/import.c:692
 #, 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:478 g10/import.c:671
+#: g10/import.c:495 g10/import.c:698
 #, 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:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "nyckel %08lX: 1 ny användaridentitet\n"
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "nyckel %08lX: %d nya användaridentiteter\n"
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "nyckel %08lX: 1 ny signatur\n"
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "nyckel %08lX: %d nya signaturer\n"
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "nyckel %08lX: 1 ny undernyckel\n"
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "nyckel %08lX: %d nya undernycklar\n"
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "nyckel %08lX: inte förändrad\n"
 
-#: g10/import.c:613
+#: g10/import.c:610
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:640
 #, 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:617
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "nyckel %08lX: finns redan i den hemliga nyckelringen\n"
 
-#: g10/import.c:622
+#: g10/import.c:649
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "nyckel %08lX: hittade inte den hemliga nyckeln: %s\n"
 
-#: g10/import.c:651
+#: g10/import.c:678
 #, 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:682
+#: g10/import.c:709
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "nyckel %08lX: ogiltigt återkallelsecertifikat: %s - avvisat\n"
 
-#: g10/import.c:714
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "nyckel %08lX: återkallelsecertifikat importerat\n"
 
-#: g10/import.c:756
+#: g10/import.c:783
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "nyckel %08lX: ingen användaridentitet för signaturen\n"
 
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:790 g10/import.c:814
 #, 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:764
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "nyckel %08lX: ogiltig självsignatur\n"
 
-#: g10/import.c:779
+#: g10/import.c:806
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "nyckel %08lX: ingen undernyckel för nyckelbindning\n"
 
-#: g10/import.c:788
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "nyckel %08lX: ogiltig undernyckelbindning\n"
 
 # vad innebär fnutten i slutet?
-#: g10/import.c:815
+#: g10/import.c:842
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "nyckel %08lX: accepterade icke självsignerad användaridentitet '"
 
-#: g10/import.c:844
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "nyckel %08lX: hoppade över användaridentitet '"
 
-#: g10/import.c:867
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "nyckel %08lX: hoppade över undernyckel\n"
@@ -1972,98 +1996,98 @@
 #. * 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:892
+#: g10/import.c:919
 #, 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:901
+#: g10/import.c:928
 #, 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:909
+#: g10/import.c:936
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "nyckel %08lX: felaktigt återkallelsecertifikat: %s - hoppade över\n"
 
-#: g10/import.c:1009
+#: g10/import.c:1036
 #, 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:1060
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "nyckel %08lX: lade till återkallelsecertifikat\n"
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "nyckel %08lX: vår kopia har ingen självsignatur\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: hittade inte användaren\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr "[återkallelse]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr "[självsignatur]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
 msgstr "1 felaktig signatur\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d felaktiga signaturer\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatur verifierades inte eftersom nyckeln saknades\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signaturer verifierades inte eftersom nycklar saknades\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatur verifierades inte eftersom ett fel uppstod\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signaturer verifierades inte eftersom fel uppstod\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 användaridentitet utan giltig självsignatur hittades\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d användaridentiteter utan giltig självsignatur hittades\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Redan signerad av nyckeln %08lX\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Det finns inget att signera med nyckeln %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2071,7 +2095,7 @@
 "Är du verkligen säker på att du vill signera denna nyckel\n"
 "med din nyckel: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2079,33 +2103,33 @@
 "Signaturen kommer att markeras som icke exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "Vill du verkligen signera? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "Denna nyckel är inte skyddad.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:432
 msgid "Secret parts of primary key are not available.\n"
 msgstr "De hemliga delarna av den primära nyckeln är inte tillgängliga.\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "Nyckeln är skyddad.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan inte redigera denna nyckel: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2113,7 +2137,7 @@
 "Skriv in den nya lösenordsfrasen för denna hemliga nyckel.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2121,424 +2145,429 @@
 "Du vill inte ha någon lösenordsfras - detta är sannolikt en dålig idé!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "Vill du verkligen göra detta? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr "flyttar en nyckelsignatur till den rätta platsen\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "spara och avsluta"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "visa denna hjälp"
 
 # skall dessa översättas?
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr "visa fingeravtryck"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
 msgstr "räkna upp nycklar och användaridentiteter"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
 msgstr "välj användaridentitet N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "välj sekundär nyckel N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr "räkna upp signaturer"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr "signera nyckeln"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
 msgstr "signera nyckeln lokalt"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
 msgstr "lägg till en användaridentitet"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
 msgstr "ta bort en användaridentitet"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr "lägg till en sekundär nyckel"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "ta bort en sekundär nyckel"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
 msgstr "ta bort signaturer"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr "ändra utgångsdatum"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "hoppa mellan utskrift av hemliga och publika nycklar"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606 g10/keyedit.c:607
 msgid "list preferences"
 msgstr "skriv ut inställningar"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "pref"
+
+#: g10/keyedit.c:608
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:608
 msgid "change the passphrase"
 msgstr "ändra lösenordsfrasen"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "trust"
 msgstr "trust"
 
 # originalet borde ha ett value
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
 msgid "change the ownertrust"
 msgstr "ändra ägartillitsvärdet"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
 msgid "revoke signatures"
 msgstr "återkalla signaturer"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
 msgid "revoke a secondary key"
 msgstr "återkalla en sekundär nyckel"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
 msgid "disable a key"
 msgstr "deaktivera en nyckel"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
 msgid "enable a key"
 msgstr "aktivera en nyckel"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:633
 msgid "can't do that in batchmode\n"
 msgstr "kan ej göra detta i batch-läge\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:669
+#: g10/keyedit.c:671
 msgid "Secret key is available.\n"
 msgstr "Den hemliga nyckeln finns tillgänglig.\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:700
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
 msgid "Need the secret key to do this.\n"
 msgstr "Den hemliga nyckeln behövs för att göra detta.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Använd kommandot \"toggle\" först.\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:781
 msgid "Really sign all user IDs? "
 msgstr "Vill du verkligen signera alla användaridentiteter? "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:782
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: Välj det användarid du vill signera\n"
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:814 g10/keyedit.c:1000
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "uppdateringen av tillitsdatabasen misslyckades: %s\n"
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:825 g10/keyedit.c:846
 msgid "You must select at least one user ID.\n"
 msgstr "Du måste välja åtminstone en användaridentitet.\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:827
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:830
 msgid "Really remove all selected user IDs? "
 msgstr "Vill du verkligen ta bort alla valda användaridentiteter? "
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:831
 msgid "Really remove this user ID? "
 msgstr "Vill du verkligen ta bort denna användaridentitet? "
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:867 g10/keyedit.c:889
 msgid "You must select at least one key.\n"
 msgstr "Du måste välja åtminstone en nyckel.\n"
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:871
 msgid "Do you really want to delete the selected keys? "
 msgstr "Vill du verkligen ta bort valda nycklar? "
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:872
 msgid "Do you really want to delete this key? "
 msgstr "Vill du verkligen ta bort denna nyckel? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Vill du verkligen återkalla de valda nycklarna? "
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:894
 msgid "Do you really want to revoke this key? "
 msgstr "Vill du verkligen återkalla denna nyckel? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
 msgid "Save changes? "
 msgstr "Spara ändringarna? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:967
 msgid "Quit without saving? "
 msgstr "Avsluta utan att spara? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:978
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:985
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:992
 msgid "Key not changed so no update needed.\n"
 msgstr "Nyckeln är oförändrad så det behövs ingen uppdatering.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1007
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (försök med \"help\")\n"
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1090
+#: g10/keyedit.c:1140
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1144
 msgid "This key has been disabled"
 msgstr "Denna nyckel har deaktiverats"
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1173
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "nyckeln %08lX: en undernyckel har återkallats!\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1176
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "     nya återkallelser av nycklar: %lu\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1178
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1420
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1424
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1428
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1434
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Vill du radera denna självsignatur? (j/N)"
 
 # skulle lika gärna kunna heta 1 signatur va?
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1448
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1449
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1452
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar från de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1527
 msgid "Please select at most one secondary key.\n"
 msgstr "Välj som mest en sekundär nyckel.\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1531
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Ändrar giltighetstid för en sekundär nyckel.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1575
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1591
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1652
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med index %d\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1698
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekundär nyckel med index %d\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1796
 msgid "user ID: \""
 msgstr "användaridentitet: \""
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1799
 #, c-format
 msgid ""
 "\"\n"
@@ -2547,54 +2576,44 @@
 "\"\n"
 "signerad med din nyckel %08lX %s\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1803
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Vill du skapa ett återkallelsecertifikat för denna signatur? (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1827
 msgid "You have signed these user IDs:\n"
 msgstr "Du har signerat följande användaridentiteter:\n"
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   signerad av %08lX %s\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1846
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   återkallad av %08lX %s\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1866
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du står i begrepp att återkalla dessa signaturer:\n"
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1884
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Vill du verkligen skapa återkallelsecertifikaten? (j/N)"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1913
 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:400 g10/mainproc.c:790
+#: g10/keylist.c:279 g10/mainproc.c:851
 #, c-format
 msgid " [expires: %s]"
 msgstr "[går ut: %s]"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:269
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "den publika nyckeln är %08lX\n"
@@ -2606,122 +2625,130 @@
 # 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:284
+#: g10/mainproc.c:314
 msgid "public key encrypted data: good DEK\n"
 msgstr "data krypterad med publik nyckel: korrekt krypteringsnyckel\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:366
 #, 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:336
+#: g10/mainproc.c:376
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "krypterad med %s-nyckel, ID %08lX\n"
 
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr "det finns ingen hemlig nyckel tillgänglig för dekryptering\n"
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:390
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dekryptering med publik nyckel misslyckades: %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:430
 msgid "decryption okay\n"
 msgstr "dekrypteringen lyckades\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:435
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:440
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:459
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTERA: avsändaren efterfrågade \"endast-för-dina-ögon\"\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:461
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:632
 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:661 g10/mainproc.c:670
+#: g10/mainproc.c:719 g10/mainproc.c:728
 msgid "WARNING: invalid notation data found\n"
 msgstr "VARNING: ogiltig notationsdata hittades\n"
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:731
 msgid "Notation: "
 msgstr "Notation: "
 
 # finns det någon bra svensk översättning av policy?
-#: g10/mainproc.c:680
+#: g10/mainproc.c:740
 msgid "Policy: "
 msgstr "Policy: "
 
-#: g10/mainproc.c:1121
+#: g10/mainproc.c:1193
 msgid "signature verification suppressed\n"
 msgstr "signaturen verifierades inte\n"
 
-#: g10/mainproc.c:1158
+#. plaintext before signatures but no one-pass packets
+#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#, fuzzy
+msgid "can't handle these multiple signatures\n"
+msgstr "skapa en signatur i en separat fil"
+
+#: g10/mainproc.c:1256
 #, 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:1184 g10/mainproc.c:1195
+#: g10/mainproc.c:1284 g10/mainproc.c:1292
 msgid "BAD signature from \""
 msgstr "FELAKTIG signatur från \""
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1196
+#: g10/mainproc.c:1285 g10/mainproc.c:1293
 msgid "Good signature from \""
 msgstr "Korrekt signatur från \""
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr "      även känd som \""
 
-#: g10/mainproc.c:1243
+#: g10/mainproc.c:1358
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte verifiera signaturen: %s\n"
 
-#: g10/mainproc.c:1318
+#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "skapa en signatur i en separat fil"
+
+#: g10/mainproc.c:1454
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "fristående signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1511
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1518
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "felaktigt rotpaket hittades i proc_tree()\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan inte deaktivera minnesutskrifter: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Experimentella algoritmer bör inte användas!\n"
 
 # XXX
-#: g10/misc.c:234
-msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
+#: g10/misc.c:238
+#, fuzzy
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
 "avråder från denna chifferalgoritm, använd istället en mer normal algoritm!\n"
 
@@ -2730,12 +2757,68 @@
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan inte hantera algoritm %d för publik nyckelhantering\n"
 
-#: g10/parse-packet.c:991
+#: g10/parse-packet.c:1010
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
 
-#: g10/passphrase.c:159
+#: g10/passphrase.c:223
+msgid "gpg-agent is not available in this session\n"
+msgstr ""
+
+#: g10/passphrase.c:229
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr ""
+
+#: g10/hkp.c:167 g10/passphrase.c:248
+#, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "kan inte ansluta till \"%s\": %s\n"
+
+#: g10/passphrase.c:313 g10/passphrase.c:576
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr " (huvudnyckelns identitet %08lX)"
+
+#: g10/passphrase.c:323
+#, fuzzy, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"\n"
+"Du behöver en lösenordsfras för att låsa upp den hemliga nyckeln för\n"
+"användaren: \""
+
+#: g10/passphrase.c:344
+#, fuzzy
+msgid "Enter passphrase\n"
+msgstr "Ange lösenordsfras: "
+
+#: g10/passphrase.c:346
+#, fuzzy
+msgid "Repeat passphrase\n"
+msgstr "Repetera lösenordsfrasen: "
+
+#: g10/passphrase.c:384
+msgid "passphrase too long\n"
+msgstr ""
+
+#: g10/passphrase.c:396
+msgid "invalid response from agent\n"
+msgstr ""
+
+#: g10/passphrase.c:405
+msgid "cancelled by user\n"
+msgstr ""
+
+#: g10/passphrase.c:408 g10/passphrase.c:477
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr ""
+
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2745,25 +2828,20 @@
 "Du behöver en lösenordsfras för att låsa upp den hemliga nyckeln för\n"
 "användaren: \""
 
-#: g10/passphrase.c:168
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bits  %s-nyckel, ID %08lX, skapad %s"
 
-#: g10/passphrase.c:173
-#, c-format
-msgid " (main key ID %08lX)"
-msgstr " (huvudnyckelns identitet %08lX)"
-
-#: g10/passphrase.c:190
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
 msgstr "kan inte fråga efter lösenord i batch-läge\n"
 
-#: g10/passphrase.c:194
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr "Ange lösenordsfras: "
 
-#: g10/passphrase.c:198
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr "Repetera lösenordsfrasen: "
 
@@ -2771,19 +2849,24 @@
 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:324
+#: g10/plaintext.c:332
 msgid "Detached signature.\n"
 msgstr "Löskopplad signatur.\n"
 
-#: g10/plaintext.c:328
+#: g10/plaintext.c:336
 msgid "Please enter name of data file: "
 msgstr "Ange namnet på datafilen: "
 
-#: g10/plaintext.c:349
+#: g10/plaintext.c:357
 msgid "reading stdin ...\n"
 msgstr "läser från standard in ...\n"
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:391
+#, fuzzy
+msgid "no signed data\n"
+msgstr "kan inte öppna signerad data \"%s\"\n"
+
+#: g10/plaintext.c:399
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kan inte öppna signerad data \"%s\"\n"
@@ -2816,41 +2899,36 @@
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTERA: den hemliga nyckeln %08lX gick ut %s\n"
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr "fråga efter nyckeln %08lX från %s ...\n"
 
-#: g10/hkp.c:85
+#: g10/hkp.c:83
 #, 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:109 g10/hkp.c:148
+#: g10/hkp.c:102 g10/hkp.c:136
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "känner inte till någon nyckelserver (använd flaggan --keyserver)\n"
 
-#: g10/hkp.c:117
+#: g10/hkp.c:110
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: ogiltig nyckelidentitet\n"
 
-#: 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:194
+#: g10/hkp.c:191
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "fel vid sändning till \"%s\": %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:203
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "lyckades sända till \"%s\" (status=%u)\n"
 
-#: g10/hkp.c:209
+#: g10/hkp.c:206
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "misslyckades sända till \"%s\": status=%u\n"
@@ -2894,31 +2972,36 @@
 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:324
-#, c-format
-msgid "NOTE: signature key expired %s\n"
+#: g10/sig-check.c:328
+#, fuzzy, c-format
+msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTERA: signaturnyckeln är för gammal, gick ut vid %s\n"
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 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"
 
-#: g10/sign.c:140
+#: g10/sign.c:152
+#, fuzzy, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "Kan inte verifiera signaturen: %s\n"
+
+#: g10/sign.c:161
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s-signatur från: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:307 g10/sign.c:630
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan inte skapa %s: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:405
 msgid "signing:"
 msgstr "signerar:"
 
-#: g10/sign.c:431
+#: g10/sign.c:448
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VARNING: \"%s\" är en tom fil\n"
@@ -2957,7 +3040,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalogen finns inte!\n"
 
-#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
+#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: kan inte skapa: %s\n"
@@ -3141,11 +3224,6 @@
 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"
@@ -3359,7 +3437,7 @@
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "VARNING: kan ännu inte hantera långa inställningsposter\n"
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -3369,7 +3447,7 @@
 "Kom ihåg att signaturfilen (.sig eller .asc)\n"
 "ska vara den först angivna filen på kommandoraden\n"
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "raden %u är för lång, eller saknar nyradstecken\n"
@@ -3379,42 +3457,52 @@
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: kan inte skapa nyckelring: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1374
+#: g10/ringedit.c:319 g10/ringedit.c:1376
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: nyckelring skapad\n"
 
 # märkligt felmeddelande, kolla upp
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1557
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VARNING: det finns 2 filer med konfidentiell information.\n"
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1558
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s är den oförändrade\n"
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1559
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s är den nya\n"
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1560
 msgid "Please fix this possible security flaw\n"
 msgstr "Lös detta potentiella säkerhetsproblem\n"
 
 # om någon kan tala om för mig vad detta betyder skulle jag bli jätteglad!
-#: g10/skclist.c:88 g10/skclist.c:125
+#: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "nyckeln är inte markerad osäker - går inte att använda med fejkad RNG!\n"
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, fuzzy, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "hoppade över \"%s\": %s\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "hoppade över \"%s\": %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+#, fuzzy
+msgid "skipped: secret key already present\n"
+msgstr "%s: hoppade över: publik nyckel finns redan\n"
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3442,32 +3530,32 @@
 msgid "Enter new filename"
 msgstr "Ange nytt filnamn"
 
-#: g10/openfile.c:182
+#: g10/openfile.c:184
 msgid "writing to stdout\n"
 msgstr "skriver till standard ut\n"
 
-#: g10/openfile.c:261
+#: g10/openfile.c:273
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "antar att signera data finns i filen \"%s\"\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:323
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: ny inställningsfil skapad\n"
 
-#: g10/openfile.c:338
+#: g10/openfile.c:350
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: kan inte skapa katalog: %s\n"
 
-#: g10/openfile.c:341
+#: g10/openfile.c:353
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: katalog skapad\n"
 
 # GnuPG borde väl ersättas med %s?
-#: g10/openfile.c:343
+#: g10/openfile.c:355
 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"
 
@@ -3488,6 +3576,11 @@
 "VARNING: meddelandet krypterades med en svag nyckel i det symmetriska\n"
 "chiffret.\n"
 
+#: g10/encr-data.c:97
+#, fuzzy
+msgid "problem handling encrypted packet\n"
+msgstr "släng bort nyckelidentitetsfältet från krypterade paket"
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "skapade en svag nyckel - försöker igen\n"
@@ -3499,14 +3592,6 @@
 "kan inte undvika en svag nyckel för symmetriskt chiffer; försökte\n"
 "%d gånger!\n"
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "det finns en hemlig nyckel tillhörande denna publika nyckel!\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr "använd flaggan \"--delete-secret-key\" för att ta bort den först.\n"
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "kan inte göra så i batch-läge utan flaggan \"--yes\"\n"
@@ -3519,6 +3604,14 @@
 msgid "This is a secret key! - really delete? "
 msgstr "Detta är en hemlig nyckel! - vill du verkligen ta bort den? "
 
+#: g10/delkey.c:181
+msgid "there is a secret key for this public key!\n"
+msgstr "det finns en hemlig nyckel tillhörande denna publika nyckel!\n"
+
+#: g10/delkey.c:183
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr "använd flaggan \"--delete-secret-key\" för att ta bort den först.\n"
+
 #: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
@@ -3786,6 +3879,26 @@
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Det finns ingen hjälp tillgänglig för \"%s\""
+
+#, fuzzy
+#~ msgid "invalid"
+#~ msgstr "felaktigt skal"
+
+#, fuzzy
+#~ msgid "revoked"
+#~ msgstr "revkey"
+
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "det går inte att använda RSA-nycklar i denna version\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Ingen nyckel för användaridentiteten\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Inget användarid för nyckel\n"
+
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "det finns ingen hemlig nyckel tillgänglig för dekryptering\n"
 
 # maila gnupg-bugs om konstigt felmeddelande, man skapar nycklar i pluralis
 #~ msgid ""
diff -urN gnupg-1.0.4/po/tr.po gnupg-1.0.5/po/tr.po
--- gnupg-1.0.4/po/tr.po	Thu Jan  1 01:00:00 1970
+++ gnupg-1.0.5/po/tr.po	Sun Apr 29 16:39:32 2001
@@ -0,0 +1,3834 @@
+# GnuPG Turkish messages.
+# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+# Nilgun Belma Buguner <nilgun@technologist.com>, 2000.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnupg-1.0.4\n"
+"POT-Creation-Date: 2001-04-29 16:39+0200\n"
+"PO-Revision-Date: 2000-11-01 05:20+300\n"
+"Last-Translator: Nilgün Belma Bugüner <nilgun@technologist.com>\n"
+"Language-Team: Turkish <tr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-9\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#: util/secmem.c:79
+msgid "Warning: using insecure memory!\n"
+msgstr "Uyarý: kullanýlan bellek güvenli deðil!\n"
+
+#: util/secmem.c:299
+msgid "operation is not possible without initialized secure memory\n"
+msgstr "güvenli bellek hazýrlanmadan iþlem yapmak mümkün deðil\n"
+
+#: util/secmem.c:300
+msgid "(you may have used the wrong program for this task)\n"
+msgstr "(bu görev için yanlýþ program kullanmýþ olabilirsiniz)\n"
+
+#: util/miscutil.c:287 util/miscutil.c:316
+msgid "yes"
+msgstr "evet"
+
+#: util/miscutil.c:288 util/miscutil.c:319
+msgid "yY"
+msgstr "eE"
+
+#: util/miscutil.c:289 util/miscutil.c:317
+msgid "no"
+msgstr "hayýr"
+
+#: util/miscutil.c:290 util/miscutil.c:320
+msgid "nN"
+msgstr "yY"
+
+#: g10/keyedit.c:581 util/miscutil.c:318
+msgid "quit"
+msgstr "çýkýþ"
+
+#: util/miscutil.c:321
+msgid "qQ"
+msgstr "çÇ"
+
+#: util/errors.c:54
+msgid "general error"
+msgstr "genel hata"
+
+#: util/errors.c:55
+msgid "unknown packet type"
+msgstr "bilinmeyen paket tipi"
+
+#: util/errors.c:56
+msgid "unknown version"
+msgstr "bilinmeyen sürüm"
+
+#: util/errors.c:57
+msgid "unknown pubkey algorithm"
+msgstr "bilinmeyen pubkey algoritmasý"
+
+#: util/errors.c:58
+msgid "unknown digest algorithm"
+msgstr "bilinmeyen özümleme algoritmasý"
+
+#: util/errors.c:59
+msgid "bad public key"
+msgstr "genel anahtar hatalý"
+
+#: util/errors.c:60
+msgid "bad secret key"
+msgstr "gizli anahtar hatalý"
+
+#: util/errors.c:61
+msgid "bad signature"
+msgstr "imza hatalý"
+
+#: util/errors.c:62
+msgid "checksum error"
+msgstr "\"checksum\" hatasý"
+
+#: util/errors.c:63
+msgid "bad passphrase"
+msgstr "anahtar parolasý hatalý"
+
+#: util/errors.c:64
+msgid "public key not found"
+msgstr "genel anahtar bulunamadý"
+
+#: util/errors.c:65
+msgid "unknown cipher algorithm"
+msgstr "bilinmeyen þifre algoritmasý"
+
+#: util/errors.c:66
+msgid "can't open the keyring"
+msgstr "anahtar demeti açýlamadý"
+
+#: util/errors.c:67
+msgid "invalid packet"
+msgstr "geçersiz paket"
+
+#: util/errors.c:68
+msgid "invalid armor"
+msgstr "geçersiz zýrh"
+
+#: util/errors.c:69
+msgid "no such user id"
+msgstr "böyle bir özgün dizi yok"
+
+#: util/errors.c:70
+msgid "secret key not available"
+msgstr "gizli anahtar kullanýþsýz"
+
+#: util/errors.c:71
+msgid "wrong secret key used"
+msgstr "yanlýþ gizli anahtar kullanýlmýþ"
+
+#: util/errors.c:72
+msgid "not supported"
+msgstr "desteklenmiyor"
+
+#: util/errors.c:73
+msgid "bad key"
+msgstr "anahtar hatalý"
+
+#: util/errors.c:74
+msgid "file read error"
+msgstr "dosya okuma hatasý"
+
+#: util/errors.c:75
+msgid "file write error"
+msgstr "dosya yazma hatasý"
+
+#: util/errors.c:76
+msgid "unknown compress algorithm"
+msgstr "bilinmeyen sýkýþtýrma algoritmasý"
+
+#: util/errors.c:77
+msgid "file open error"
+msgstr "dosya açma hatasý"
+
+#: util/errors.c:78
+msgid "file create error"
+msgstr "dosya oluþturma hatasý"
+
+#: util/errors.c:79
+msgid "invalid passphrase"
+msgstr "anahtar parolasý geçersiz"
+
+#: util/errors.c:80
+msgid "unimplemented pubkey algorithm"
+msgstr "tamamlanmamýþ pubkey algoritmasý"
+
+#: util/errors.c:81
+msgid "unimplemented cipher algorithm"
+msgstr "tamamlanmamýþ cipher algoritmasý"
+
+#: util/errors.c:82
+msgid "unknown signature class"
+msgstr "bilinmeyen imza sýnýfý"
+
+#: util/errors.c:83
+msgid "trust database error"
+msgstr "güvence veritabaný hatasý"
+
+#: util/errors.c:84
+msgid "bad MPI"
+msgstr "MPI hatalý"
+
+#: util/errors.c:85
+msgid "resource limit"
+msgstr "iç kaynak sýnýrý"
+
+#: util/errors.c:86
+msgid "invalid keyring"
+msgstr "anahtar demeti geçersiz"
+
+#: util/errors.c:87
+msgid "bad certificate"
+msgstr "sertifika hatalý"
+
+#: util/errors.c:88
+msgid "malformed user id"
+msgstr "özgün dizi bozuk"
+
+#: util/errors.c:89
+msgid "file close error"
+msgstr "dosya kapama hatasý"
+
+#: util/errors.c:90
+msgid "file rename error"
+msgstr "dosya isimlendirme hatasý"
+
+#: util/errors.c:91
+msgid "file delete error"
+msgstr "dosya silme hatasý"
+
+#: util/errors.c:92
+msgid "unexpected data"
+msgstr "beklenmeyen veri"
+
+#: util/errors.c:93
+msgid "timestamp conflict"
+msgstr "damga çeliþkili"
+
+#: util/errors.c:94
+msgid "unusable pubkey algorithm"
+msgstr "pubkey algoritmasý kullanýþsýz"
+
+#: util/errors.c:95
+msgid "file exists"
+msgstr "dosya mevcut"
+
+#: util/errors.c:96
+msgid "weak key"
+msgstr "anahtar zayýf"
+
+#: util/errors.c:97
+msgid "invalid argument"
+msgstr "geçersiz argüman"
+
+#: util/errors.c:98
+msgid "bad URI"
+msgstr "URI hatalý"
+
+#: util/errors.c:99
+msgid "unsupported URI"
+msgstr "desteklenmeyen URI"
+
+#: util/errors.c:100
+msgid "network error"
+msgstr "að hatasý"
+
+#: util/errors.c:102
+msgid "not encrypted"
+msgstr "þifrelenemedi"
+
+#: util/errors.c:103
+msgid "not processed"
+msgstr "iþlenemedi"
+
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "genel anahtar hatalý"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "gizli anahtar hatalý"
+
+#: util/logger.c:224
+#, c-format
+msgid "... this is a bug (%s:%d:%s)\n"
+msgstr "... bu bir yazýlým hatasý (%s:%d:%s)\n"
+
+#: util/logger.c:230
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "bir yazýlým hatasý buldunuz ... (%s:%d)\n"
+
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
+#, c-format
+msgid "can't open `%s': %s\n"
+msgstr "`%s' açýlamýyor: %s\n"
+
+#: cipher/random.c:324
+#, c-format
+msgid "can't stat `%s': %s\n"
+msgstr "`%s' durumlanamýyor: %s\n"
+
+#: cipher/random.c:329
+#, c-format
+msgid "`%s' is not a regular file - ignored\n"
+msgstr "`%s' düzenli bir dosya deðil - görülmedi\n"
+
+#: cipher/random.c:334
+msgid "note: random_seed file is empty\n"
+msgstr "not: \"random_seed\" dosyasý boþ\n"
+
+#: cipher/random.c:340
+msgid "warning: invalid size of random_seed file - not used\n"
+msgstr "uyarý: \"random_seed\" dosyasýnýn boyu hatalý - kullanýlmadý\n"
+
+#: cipher/random.c:348
+#, c-format
+msgid "can't read `%s': %s\n"
+msgstr "\"%s\" okunamyor: %s\n"
+
+#: cipher/random.c:386
+msgid "note: random_seed file not updated\n"
+msgstr "not: \"random_seed\" dosyasý güncel deðil\n"
+
+#: cipher/random.c:406
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "\"%s\" oluþturulamýyor: %s\n"
+
+#: cipher/random.c:413
+#, c-format
+msgid "can't write `%s': %s\n"
+msgstr "\"%s\" yazýlamýyor: %s\n"
+
+#: cipher/random.c:416
+#, c-format
+msgid "can't close `%s': %s\n"
+msgstr "\"%s\" kapatýlamýyor: %s\n"
+
+#: cipher/random.c:427
+#, c-format
+msgid "too many random bits requested; the limit is %d\n"
+msgstr "çok fazla rasgele bit istendi; sýnýr: %d\n"
+
+#: cipher/random.c:661
+msgid "WARNING: using insecure random number generator!!\n"
+msgstr "UYARI: kullanýlan rasgele sayý üreteci güvenli deðil!!\n"
+
+#: cipher/random.c:662
+msgid ""
+"The random number generator is only a kludge to let\n"
+"it run - it is in no way a strong RNG!\n"
+"\n"
+"DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
+"\n"
+msgstr ""
+"Rasgele sayý üretecinin (RSÜ) kendi halinde çalýþan yalnýz ve yalnýz bir\n"
+"\"kludge\"ý var -  dolayýsýyla iþimizi görecek saðlýklý bir RSÜ yok!\n"
+"\n"
+"BU PROGRAMLA ÜRETÝLMÝÞ HÝÇBÝR VERÝYÝ KULLANMAYIN!!\n"
+"\n"
+
+#: cipher/rndlinux.c:142
+#, c-format
+msgid ""
+"\n"
+"Not enough random bytes available.  Please do some other work to give\n"
+"the OS a chance to collect more entropy! (Need %d more bytes)\n"
+msgstr ""
+"\n"
+"Rasgele üretilen baytlar yetersiz. Lütfen bazý iþlemler yaparak\n"
+"daha fazla ganimet toplayabilmesi için iþletim sistemine\n"
+"bir þans! verin. (%d bayt daha gerekiyor)\n"
+
+#: g10/g10.c:216
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Komutlar:\n"
+" "
+
+#: g10/g10.c:218
+msgid "|[file]|make a signature"
+msgstr "|[dosya]|bir imza yapar"
+
+#: g10/g10.c:219
+msgid "|[file]|make a clear text signature"
+msgstr "|[dosya]|açýkça okunabilen bir imza yapar"
+
+#: g10/g10.c:220
+msgid "make a detached signature"
+msgstr "baðýmsýz bir imza yapar"
+
+#: g10/g10.c:221
+msgid "encrypt data"
+msgstr "veriyi þifreler"
+
+#: g10/g10.c:222
+msgid "encryption only with symmetric cipher"
+msgstr "sadece simetrik þifre ile þifreler"
+
+#: g10/g10.c:223
+msgid "store only"
+msgstr "sadece saklar"
+
+#: g10/g10.c:224
+msgid "decrypt data (default)"
+msgstr "veri þifresini açar (öntanýmlý)"
+
+#: g10/g10.c:225
+msgid "verify a signature"
+msgstr "bir imzayý doðrular"
+
+#: g10/g10.c:227
+msgid "list keys"
+msgstr "anahtarlarý listeler"
+
+#: g10/g10.c:229
+msgid "list keys and signatures"
+msgstr "anahtarlarý ve imzalarý listeler"
+
+#: g10/g10.c:230
+msgid "check key signatures"
+msgstr "anahtar imzalarýný kontrol eder"
+
+#: g10/g10.c:231
+msgid "list keys and fingerprints"
+msgstr "anahtarlarý ve parmak izlerini listeler"
+
+#: g10/g10.c:232
+msgid "list secret keys"
+msgstr "gizli anahtarlarý listeler"
+
+#: g10/g10.c:233
+msgid "generate a new key pair"
+msgstr "yeni bir anahtar çifti üretir"
+
+#: g10/g10.c:234
+msgid "remove key from the public keyring"
+msgstr "genel anahtar demetinden anahtarý kaldýrýr"
+
+#: g10/g10.c:236
+msgid "remove key from the secret keyring"
+msgstr "gizli anahtar demetinden anahtarý kaldýrýr"
+
+#: g10/g10.c:237
+msgid "sign a key"
+msgstr "bir anahtarý imzalar"
+
+#: g10/g10.c:238
+msgid "sign a key locally"
+msgstr "bir anahtarý yerel olarak imzalar"
+
+#: g10/g10.c:239
+msgid "sign or edit a key"
+msgstr "bir anahtarý düzenler ve imzalar"
+
+#: g10/g10.c:240
+msgid "generate a revocation certificate"
+msgstr "bir yürürlükten kaldýrma sertifikasý üretir"
+
+#: g10/g10.c:241
+msgid "export keys"
+msgstr "anahtarlarý gönderir"
+
+#: g10/g10.c:242
+msgid "export keys to a key server"
+msgstr "anahtarlarý bir anahtar sunucusuna gönderir"
+
+#: g10/g10.c:243
+msgid "import keys from a key server"
+msgstr "anahtarlarý bir anahtar sunucusundan indirir"
+
+#: g10/g10.c:247
+msgid "import/merge keys"
+msgstr "anahtarlarý indirir/katýþtýrýr"
+
+#: g10/g10.c:249
+msgid "list only the sequence of packets"
+msgstr "sadece paketlerin silsilesini listeler"
+
+#: g10/g10.c:251
+msgid "export the ownertrust values"
+msgstr "sahibiningüvencesi deðerlerini gönderir"
+
+#: g10/g10.c:253
+msgid "import ownertrust values"
+msgstr "sahibiningüvencesi deðerlerini indirir"
+
+#: g10/g10.c:255
+msgid "update the trust database"
+msgstr "güvence veritabanýný günceller"
+
+#: g10/g10.c:257
+msgid "|[NAMES]|check the trust database"
+msgstr "|[ÝSÝMLER]|güvence veritabanýný kontrol eder"
+
+#: g10/g10.c:258
+msgid "fix a corrupted trust database"
+msgstr "bozulan güvence veritabanýný onarýr"
+
+#: g10/g10.c:259
+msgid "De-Armor a file or stdin"
+msgstr "Bir dosya veya standard girdinin zýrhýný kaldýrýr"
+
+#: g10/g10.c:261
+msgid "En-Armor a file or stdin"
+msgstr "Bir dosya veya standard girdiyi zýrhlar"
+
+#: g10/g10.c:263
+msgid "|algo [files]|print message digests"
+msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
+
+#: g10/g10.c:267
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Seçenekler:\n"
+" "
+
+#: g10/g10.c:269
+msgid "create ascii armored output"
+msgstr "ascii zýrhlý çýktý oluþturur"
+
+#: g10/g10.c:271
+msgid "|NAME|encrypt for NAME"
+msgstr "|ÝSÝM|ÝSÝM için þifreleme yapar"
+
+#: g10/g10.c:274
+msgid "|NAME|use NAME as default recipient"
+msgstr "|ÝSÝM|öntanýmlý alýcý olarak ÝSÝM kullanýlýr"
+
+#: g10/g10.c:276
+msgid "use the default key as default recipient"
+msgstr "öntanýmlý alýcý olarak öntanýmlý anahtar kullanýlýr"
+
+#: g10/g10.c:280
+msgid "use this user-id to sign or decrypt"
+msgstr "imzalamak ya da þifre çözmek için bu özgün dizi kullanýlýr"
+
+#: g10/g10.c:281
+msgid "|N|set compress level N (0 disables)"
+msgstr "|N|sýkýþtýrma seviyesi N olarak ayarlanýr (0 ise sýkýþtýrma yapýlmaz)"
+
+#: g10/g10.c:283
+msgid "use canonical text mode"
+msgstr "meþru metin kipini kullanýr"
+
+#: g10/g10.c:284
+msgid "use as output file"
+msgstr "çýktý dosyasý olarak kullanýlýr"
+
+#: g10/g10.c:285
+msgid "verbose"
+msgstr "çok detaylý"
+
+#: g10/g10.c:286
+msgid "be somewhat more quiet"
+msgstr "daha az detaylý"
+
+#: g10/g10.c:287
+msgid "don't use the terminal at all"
+msgstr "herþeye terminal kullanma"
+
+#: g10/g10.c:288
+msgid "force v3 signatures"
+msgstr "v3 imzalarýna zorlar"
+
+#: g10/g10.c:289
+msgid "always use a MDC for encryption"
+msgstr "þifreleme için daima bir MDC kullanýlýr"
+
+#: g10/g10.c:290
+msgid "do not make any changes"
+msgstr "hiçbir deðiþiklik yapmaz"
+
+#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
+#: g10/g10.c:292
+msgid "use the gpg-agent"
+msgstr ""
+
+#: g10/g10.c:293
+msgid "batch mode: never ask"
+msgstr "önceden belirlenmiþ iþlemler kipi: hiç sormaz"
+
+#: g10/g10.c:294
+msgid "assume yes on most questions"
+msgstr "sorularýn çoðunda cevap evet farzedilir"
+
+#: g10/g10.c:295
+msgid "assume no on most questions"
+msgstr "sorularýn çoðunda cevap hayýr farzedilir"
+
+#: g10/g10.c:296
+msgid "add this keyring to the list of keyrings"
+msgstr "bu anahtar demetini anahtar demetleri listesine ekler"
+
+#: g10/g10.c:297
+msgid "add this secret keyring to the list"
+msgstr "bu gizli anahtar demetini listeye ekler"
+
+#: g10/g10.c:298
+msgid "|NAME|use NAME as default secret key"
+msgstr "|ÝSÝM|öntanýmlý gizli anahtar olarak ÝSÝM kullanýlýr"
+
+#: g10/g10.c:299
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr "|SUNUCU|anahtarlarý aramak için bu anahtar sunucusu kullanýlýr"
+
+#: g10/g10.c:300
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|ÝSÝM|terminal karakter setini ÝSÝM olarak ayarlar"
+
+#: g10/g10.c:301
+msgid "read options from file"
+msgstr "seçenekleri dosyadan okur"
+
+#: g10/g10.c:305
+msgid "|FD|write status info to this FD"
+msgstr "|FD|durum bilgisini bu FD'ye yazar"
+
+#: g10/g10.c:310
+msgid "|KEYID|ulimately trust this key"
+msgstr "|ANAHTAR-KÝMLÝK|bu anahtar son derece güvence altýnda"
+
+#: g10/g10.c:311
+msgid "|FILE|load extension module FILE"
+msgstr "|DOSYA|geniþletme modülü olarak DOSYA yüklenir"
+
+#: g10/g10.c:312
+msgid "emulate the mode described in RFC1991"
+msgstr "RFC1991 de açýklanan kipi uygular"
+
+#: g10/g10.c:313
+msgid "set all packet, cipher and digest options to OpenPGP behavior"
+msgstr "tüm paket, þifre ve özümleme seçeneklerini OpenPGP tarzýnda ayarlar"
+
+#: g10/g10.c:314
+msgid "|N|use passphrase mode N"
+msgstr "|N|anahtar parolasý kipi olarak N kullanýlýr"
+
+#: g10/g10.c:316
+msgid "|NAME|use message digest algorithm NAME for passphrases"
+msgstr ""
+"|ÝSÝM|anahtar parolalarý için ileti özümleme algoritmasý olarak ÝSÝM "
+"kullanýlýr"
+
+#: g10/g10.c:318
+msgid "|NAME|use cipher algorithm NAME for passphrases"
+msgstr "|ÝSÝM|anahtar parolalarý için þifre algoritmasý olarak ÝSÝM kullanýlýr"
+
+#: g10/g10.c:319
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|ÝSÝM|þifre algoritmasý olarak ÝSÝM kullanýlýr"
+
+#: g10/g10.c:320
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|ÝSÝM|özümleme algoritmasý olarak ÝSÝM kullanýlýr"
+
+#: g10/g10.c:321
+msgid "|N|use compress algorithm N"
+msgstr "|N|sýkýþtýrma algoritmasý olarak N kullanýlýr"
+
+#: g10/g10.c:322
+msgid "throw keyid field of encrypted packets"
+msgstr "þifreli paketlerin anahtar-kimlik alanlarýný kurar"
+
+#: g10/g10.c:323
+msgid "|NAME=VALUE|use this notation data"
+msgstr "|ÝSÝM=DEÐER|veri bu nitelemeyle kullanýlýr"
+
+#: g10/g10.c:326
+msgid ""
+"@\n"
+"(See the man page for a complete listing of all commands and options)\n"
+msgstr ""
+"@\n"
+"(Tüm komut ve seçeneklerin komple listesi için man sayfalarýna bakýn)\n"
+
+#: g10/g10.c:329
+msgid ""
+"@\n"
+"Examples:\n"
+"\n"
+" -se -r Bob [file]          sign and encrypt for user Bob\n"
+" --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"
+msgstr ""
+"@\n"
+"Örnekler:\n"
+"\n"
+" -se -r Ali [dosya]         kullanýcý Ali için imzalar ve þifreler\n"
+" --clearsign [dosya]        açýkça okunabilir bir imza yapar\n"
+" --detach-sign [file]       baðýmsýz bir imza yapar\n"
+" --list-keys [isimler]      anahtarlarý listeler\n"
+" --fingerprint [isimler]    parmak izlerini gösterir\n"
+
+#: g10/g10.c:438
+msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
+msgstr "Yazýlým hatalarýný lütfen <gnupg-bugs@gnu.org> adresine bildirin.\n"
+
+#: g10/g10.c:442
+msgid "Usage: gpg [options] [files] (-h for help)"
+msgstr "Kullanýmý: gpg [seçenekler] [dosyalar] (yardým için -h)"
+
+#: g10/g10.c:445
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"sign, check, encrypt or decrypt\n"
+"default operation depends on the input data\n"
+msgstr ""
+"Yazýlýþý: gpg [seçenekler] [dosyalar]\n"
+"imzalama, kontrol, þifreleme veya çözme\n"
+"öntanýmlý iþlem girilen veriye baðýmlýdýr\n"
+
+#: g10/g10.c:452
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"Desteklenen algoritmalar:\n"
+
+#: g10/g10.c:531
+msgid "usage: gpg [options] "
+msgstr "kullanýmý: gpg [seçenekler] "
+
+#: g10/g10.c:584
+msgid "conflicting commands\n"
+msgstr "çeliþen komutlar\n"
+
+#: g10/g10.c:734
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "NOT: \"%s\" öntanýmlý seçenek dosyasý yok\n"
+
+#: g10/g10.c:738
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "seçenek dosyasý \"%s\": %s\n"
+
+#: g10/g10.c:745
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "\"%s\"den seçenekler okunuyor\n"
+
+#: g10/g10.c:950
+#, c-format
+msgid "%s is not a valid character set\n"
+msgstr "%s geçerli bir karakter seti deðil\n"
+
+#: g10/g10.c:1024
+msgid "WARNING: program may create a core file!\n"
+msgstr "UYARI: program bir \"core\" dosyasý yaratabilir!\n"
+
+#: g10/g10.c:1028 g10/g10.c:1037
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "NOT: %s normal kullaným için deðil!\n"
+
+#: g10/g10.c:1030
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s ile %s birlikte kullanýlmaz!\n"
+
+#: g10/g10.c:1033
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s, %s ile etkisiz olur!\n"
+
+#: g10/g10.c:1053 g10/g10.c:1065
+msgid "selected cipher algorithm is invalid\n"
+msgstr "seçilen cipher algoritmasý geçersiz\n"
+
+#: g10/g10.c:1059 g10/g10.c:1071
+msgid "selected digest algorithm is invalid\n"
+msgstr "seçilen özümleme algoritmasý geçersiz\n"
+
+#: g10/g10.c:1075
+msgid "the given policy URL is invalid\n"
+msgstr "verilmiþ güvenlik URL(=web adresi) geçersiz\n"
+
+#: g10/g10.c:1078
+#, c-format
+msgid "compress algorithm must be in range %d..%d\n"
+msgstr "sýkýþtýrma algoritmasý %d..%d aralýðýnda olmalý\n"
+
+#: g10/g10.c:1080
+msgid "completes-needed must be greater than 0\n"
+msgstr "\"completes-needed\" 0 dan büyük olmalý\n"
+
+#: g10/g10.c:1082
+msgid "marginals-needed must be greater than 1\n"
+msgstr "\"marginals-needed\" 1 den büyük olmalý\n"
+
+#: g10/g10.c:1084
+msgid "max-cert-depth must be in range 1 to 255\n"
+msgstr "\"max-cert-depth\" 1 ile 255 arasýnda olmalý\n"
+
+#: g10/g10.c:1087
+msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
+msgstr "NOT: basit S2K kipi (0) kesinlikle cesaret kýrýcý\n"
+
+#: g10/g10.c:1091
+msgid "invalid S2K mode; must be 0, 1 or 3\n"
+msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalý\n"
+
+#: g10/g10.c:1176
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "\"TrustDB\" güvence veritabaný baþlangýç aþamasýnda baþarýsýz: %s\n"
+
+#: g10/g10.c:1182
+msgid "--store [filename]"
+msgstr "--store [dosyaismi]"
+
+#: g10/g10.c:1189
+msgid "--symmetric [filename]"
+msgstr "--symmetric [dosyaismi]"
+
+#: g10/g10.c:1197
+msgid "--encrypt [filename]"
+msgstr "--encrypt [dosyaismi]"
+
+#: g10/g10.c:1210
+msgid "--sign [filename]"
+msgstr "--sign [dosyaismi]"
+
+#: g10/g10.c:1223
+msgid "--sign --encrypt [filename]"
+msgstr "--sign --encrypt [dosyaismi]"
+
+#: g10/g10.c:1237
+msgid "--clearsign [filename]"
+msgstr "--clearsign [dosyaismi]"
+
+#: g10/g10.c:1254
+msgid "--decrypt [filename]"
+msgstr "--decrypt [dosyaismi]"
+
+#: g10/g10.c:1262
+msgid "--sign-key user-id"
+msgstr "--sign-key öz-dizi"
+
+#: g10/g10.c:1270
+msgid "--lsign-key user-id"
+msgstr "--lsign-key öz-dizi"
+
+#: g10/g10.c:1278
+msgid "--edit-key user-id [commands]"
+msgstr "--edit-key öz-dizi [komutlar]"
+
+#: g10/g10.c:1294
+msgid "--delete-secret-key user-id"
+msgstr "--delete-secret-key öz-dizi"
+
+#: g10/g10.c:1297
+msgid "--delete-key user-id"
+msgstr "--delete-key öz-dizi"
+
+#: g10/g10.c:1305
+#, fuzzy
+msgid "--delete-secret-and-public-key user-id"
+msgstr "--delete-secret-key öz-dizi"
+
+#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "%s açýlamadý: %s\n"
+
+#: g10/g10.c:1357
+msgid "-k[v][v][v][c] [user-id] [keyring]"
+msgstr "-k[v][v][v][c] [öz-dizi] [anahtardemeti]"
+
+#: g10/g10.c:1423
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "zýrhýn kaldýrýlmasý baþarýsýz: %s\n"
+
+#: g10/g10.c:1431
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "zýrhlama baþarýsýz: %s\n"
+
+#: g10/g10.c:1502
+#, c-format
+msgid "invalid hash algorithm `%s'\n"
+msgstr "\"s\" hash algoritmasý geçersiz\n"
+
+#: g10/g10.c:1589
+msgid "[filename]"
+msgstr "[dosyaismi]"
+
+#: g10/g10.c:1593
+msgid "Go ahead and type your message ...\n"
+msgstr "Baþa dönüp iletinizi yazýn ...\n"
+
+#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
+#, c-format
+msgid "can't open `%s'\n"
+msgstr "\"s\" açýlamadý\n"
+
+#: g10/g10.c:1805
+msgid ""
+"the first character of a notation name must be a letter or an underscore\n"
+msgstr "bir niteleme isminin ilk karakteri bir harf ya da altçizgi olmalý\n"
+
+#: g10/g10.c:1811
+msgid ""
+"a notation name must have only letters, digits, dots or underscores and end "
+"with an '='\n"
+msgstr ""
+"bir niteleme ismi sadece harf, rakam, nokta, ve altçizgi karakterleri "
+"içerebilir ve bir \"=\" iþareti ile biter\n"
+
+#: g10/g10.c:1817
+msgid "dots in a notation name must be surrounded by other characters\n"
+msgstr ""
+"bir niteleme isminde noktalar diðer karakterler tarafýndan kuþatýlmýþ "
+"olmalýdýr\n"
+
+#: g10/g10.c:1825
+msgid "a notation value must not use any control characters\n"
+msgstr "bir niteleme deðerinde kontrol karakterleri kullanýlamaz\n"
+
+#: g10/armor.c:306
+#, c-format
+msgid "armor: %s\n"
+msgstr "zýrh: %s\n"
+
+#: g10/armor.c:335
+msgid "invalid armor header: "
+msgstr "zýrh baþlýðý geçersiz: "
+
+#: g10/armor.c:342
+msgid "armor header: "
+msgstr "zýrh baþlýðý: "
+
+#: g10/armor.c:353
+msgid "invalid clearsig header\n"
+msgstr "açýkça okunabilen imza baþlýðý geçersiz\n"
+
+#: g10/armor.c:405
+msgid "nested clear text signatures\n"
+msgstr "açýkça okunabilen imzalar dahil edildi\n"
+
+#: g10/armor.c:529
+msgid "invalid dash escaped line: "
+msgstr "\"dash escaped\" (araçizgisi escape'lý) satýr geçersiz: "
+
+#: g10/armor.c:541
+msgid "unexpected armor:"
+msgstr "beklenmeyen zýrh: "
+
+#: g10/armor.c:667 g10/armor.c:1235
+#, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "geçersiz radix64 karakteri %02x atlandý\n"
+
+#: g10/armor.c:710
+msgid "premature eof (no CRC)\n"
+msgstr "dosya sonu belirsiz (CRC yok)\n"
+
+#: g10/armor.c:744
+msgid "premature eof (in CRC)\n"
+msgstr "dosya sonu belirsiz (CRC içinde)\n"
+
+#: g10/armor.c:748
+msgid "malformed CRC\n"
+msgstr "CRC bozulmuþ\n"
+
+#: g10/armor.c:752 g10/armor.c:1272
+#, c-format
+msgid "CRC error; %06lx - %06lx\n"
+msgstr "CRC hatasý; %06lx - %06lx\n"
+
+#: g10/armor.c:772
+msgid "premature eof (in Trailer)\n"
+msgstr "dosya sonu belirsiz (kuyruk içinde)\n"
+
+#: g10/armor.c:776
+msgid "error in trailer line\n"
+msgstr "kuyruk satýrýnda hata\n"
+
+#: g10/armor.c:922
+msgid "For info see http://www.gnupg.org"
+msgstr "Bilgi için http://www.gnupg.org adresine bir bakýn"
+
+#: g10/armor.c:1050
+msgid "no valid OpenPGP data found.\n"
+msgstr "geçerli OpenPGP verisi yok\n"
+
+#: g10/armor.c:1055
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr "geçersiz zýrh: satýr %d karakterden uzun\n"
+
+#: g10/armor.c:1059
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
+msgstr ""
+"zýrh içinde uluslararasý karakterler - hatalý yazýlmýþ bir MTA kullanýlmýþ "
+"olabilir\n"
+
+#. Translators: this shoud fit into 24 bytes to that the fingerprint
+#. * data is properly aligned with the user ID
+#: g10/keyedit.c:1243 g10/pkclist.c:53
+msgid "             Fingerprint:"
+msgstr "             Parmak izi:"
+
+#: g10/pkclist.c:80
+msgid "Fingerprint:"
+msgstr " Parmak izi:"
+
+#: g10/pkclist.c:116
+msgid "No reason specified"
+msgstr "Belirtilmiþ bir neden yok"
+
+#: g10/pkclist.c:118
+msgid "Key is superseded"
+msgstr "Anahtar geçici"
+
+#: g10/pkclist.c:120
+msgid "Key has been compromised"
+msgstr "Anahtar tehlikede"
+
+#: g10/pkclist.c:122
+msgid "Key is no longer used"
+msgstr "Anahtar artýk kullanýlmayacak"
+
+#: g10/pkclist.c:124
+msgid "User ID is no longer valid"
+msgstr "Özgün dizi artýk geçersiz"
+
+#: g10/pkclist.c:128
+msgid "Reason for revocation: "
+msgstr "Yürürlükten kaldýrma sebebi: "
+
+#: g10/pkclist.c:145
+msgid "Revocation comment: "
+msgstr "Yürürlükten kaldýrma yorumu: "
+
+#. a string with valid answers
+#: g10/pkclist.c:303
+msgid "sSmMqQ"
+msgstr "bBmMçÇ"
+
+#: g10/pkclist.c:307
+#, c-format
+msgid ""
+"No trust value assigned to %lu:\n"
+"%4u%c/%08lX %s \""
+msgstr ""
+"%lu için uygun olan güvence deðeri yok:\n"
+"%4u%c/%08lX %s \""
+
+#: g10/pkclist.c:319
+msgid ""
+"Please decide how far you trust this user to correctly\n"
+"verify other users' keys (by looking at passports,\n"
+"checking fingerprints from different sources...)?\n"
+"\n"
+" 1 = Don't know\n"
+" 2 = I do NOT trust\n"
+" 3 = I trust marginally\n"
+" 4 = I trust fully\n"
+" s = please show me more information\n"
+msgstr ""
+"Bu kullanýcýnýn \"diðer kullanýcýlarý doðrulama\"\n"
+"anahtarlarýnýn uygun biçimde olduðuna nasýl\n"
+"güvence verebiliyorsunuz? Lütfen karar verin.\n"
+"(Pasaportlarýna bakarak mý, farklý kaynaklardan\n"
+"parmak izlerini kontrol ederek mi, ...?)\n"
+"\n"
+" 1 = Bilmirem )-:\n"
+" 2 = Güvence veremem\n"
+" 3 = Sýnýrlý güvence verebilirim\n"
+" 4 = Tam güvence veririm\n"
+" b = lütfen bana biraz daha bilgi ver\n"
+
+#: g10/pkclist.c:328
+msgid " m = back to the main menu\n"
+msgstr "m = ana menuye dön\n"
+
+#: g10/pkclist.c:330
+msgid " q = quit\n"
+msgstr "ç = çýk\n"
+
+#: g10/pkclist.c:336
+msgid "Your decision? "
+msgstr "Kararýnýz? "
+
+#: g10/pkclist.c:358
+msgid "Certificates leading to an ultimately trusted key:\n"
+msgstr "Son derece güvenceli bir anahtarla sonuçlanan sertifikalar:\n"
+
+#: g10/pkclist.c:429
+msgid ""
+"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"
+msgstr ""
+"Anahtara geçerli bir güvence yolu bulunamadý. Sahibi bulunmayan\n"
+"bazý güvence deðerlerinden tahsis edip edemeyeceðimize bir bakalým.\n"
+
+#: g10/pkclist.c:435
+msgid ""
+"No path leading to one of our keys found.\n"
+"\n"
+msgstr ""
+"Anahtarlarýmýzdan biriyle sonuçlanan bir yol bulunamadý.\n"
+"\n"
+
+#: g10/pkclist.c:437
+msgid ""
+"No certificates with undefined trust found.\n"
+"\n"
+msgstr ""
+"Güvence tanýmlanmamýþ sertifika bulunamadý.\n"
+"\n"
+
+#: g10/pkclist.c:439
+msgid ""
+"No trust values changed.\n"
+"\n"
+msgstr ""
+"Güvence deðerleri deðiþmedi.\n"
+"\n"
+
+#: g10/pkclist.c:457
+#, c-format
+msgid "key %08lX: key has been revoked!\n"
+msgstr "anahtar %08lX: anahtar yürürlükten kaldýrýlmýþ!\n"
+
+#: g10/pkclist.c:464 g10/pkclist.c:476 g10/pkclist.c:598
+msgid "Use this key anyway? "
+msgstr "Bu anahtar n'olursa olsun kullanýlsýn mý? "
+
+#: g10/pkclist.c:469
+#, c-format
+msgid "key %08lX: subkey has been revoked!\n"
+msgstr "anahtar %08lX: yardýmcý anahtar yürürlükten kaldýrýlmýþ!\n"
+
+#: g10/pkclist.c:512
+#, c-format
+msgid "%08lX: key has expired\n"
+msgstr "%08lX: anahtarýn kullaným süresi dolmuþ\n"
+
+#: g10/pkclist.c:518
+#, c-format
+msgid "%08lX: no info to calculate a trust probability\n"
+msgstr "%08lX: bir güvence olasýlýðýný hesaplamak için bilgi yok\n"
+
+#: g10/pkclist.c:533
+#, c-format
+msgid "%08lX: We do NOT trust this key\n"
+msgstr "%08lX: Bu anahtara güvence vermiyoruz\n"
+
+#: g10/pkclist.c:539
+#, c-format
+msgid ""
+"%08lX: It is not sure that this key really belongs to the owner\n"
+"but it is accepted anyway\n"
+msgstr ""
+"%08lX: Ne olursa olsun diyerek kabul edildiðinden bu anahtarýn gerçekten\n"
+"sahibine ait olup olmadýðýndan emin olunamaz.\n"
+
+#: g10/pkclist.c:545
+msgid "This key probably belongs to the owner\n"
+msgstr "Bu anahtarýn sahibine ait olduðu umuluyor\n"
+
+#: g10/pkclist.c:550
+msgid "This key belongs to us\n"
+msgstr "Bu anahtar bizim\n"
+
+#: g10/pkclist.c:593
+msgid ""
+"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"
+msgstr ""
+"Bu anahtarýn sahibine ait olduðu kesin DEÐÝL.\n"
+"*Gerçekten* ne yaptýðýnýzý biliyorsanýz, sonraki\n"
+"soruya da evet cevabý verebilirsiniz.\n"
+
+#: g10/pkclist.c:607 g10/pkclist.c:630
+msgid "WARNING: Using untrusted key!\n"
+msgstr "UYARI: Güvencesiz anahtar kullanýlýyor!\n"
+
+#: g10/pkclist.c:651
+msgid "WARNING: This key has been revoked by its owner!\n"
+msgstr "UYARI: Bu anahtar sahibi tarafýndan yürürlükten kaldýrýlmýþ!\n"
+
+#: g10/pkclist.c:652
+msgid "         This could mean that the signature is forgery.\n"
+msgstr "         Bu imza sahtekarlýktýr anlamýnda olabilirdi.\n"
+
+#: g10/pkclist.c:657
+msgid "WARNING: This subkey has been revoked by its owner!\n"
+msgstr ""
+"UYARI: Bu yardýmcý anahtar sahibi tarafýndan yürürlükten kaldýrýlmýþ!\n"
+
+#: g10/pkclist.c:679
+msgid "Note: This key has expired!\n"
+msgstr "Not: Bu anahtarýn kullaným süresi dolmuþ!\n"
+
+#: g10/pkclist.c:687
+msgid "WARNING: This key is not certified with a trusted signature!\n"
+msgstr "UYARI: Bu anahtar güvenceli bir imza ile sertifikalanmamýþ!\n"
+
+#: g10/pkclist.c:689
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
+msgstr "         Bu imzanýn sahibine ait olduðunu belirten bir iþaret yok.\n"
+
+#: g10/pkclist.c:706
+msgid "WARNING: We do NOT trust this key!\n"
+msgstr "UYARI: Bu anahtara güvence vermiyoruz!\n"
+
+#: g10/pkclist.c:707
+msgid "         The signature is probably a FORGERY.\n"
+msgstr "         Bu imzanýn bir SAHTEKARLIK olduðu umuluyor.\n"
+
+#: g10/pkclist.c:714
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgstr "UYARI: Bu anahtar yeterince güvenceli imzalarla sertifikalanmamýþ!\n"
+
+#: g10/pkclist.c:717
+msgid "         It is not certain that the signature belongs to the owner.\n"
+msgstr "         Bu imzanýn sahibine ait olduðu kesin deðil.\n"
+
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
+#, c-format
+msgid "%s: skipped: %s\n"
+msgstr "%s: atlandý: %s\n"
+
+#: g10/pkclist.c:826 g10/pkclist.c:993
+#, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: atlandý: genel anahtar zaten mevcut\n"
+
+#: g10/pkclist.c:853
+msgid ""
+"You did not specify a user ID. (you may use \"-r\")\n"
+"\n"
+msgstr "Bir özgün dizi belirtmediniz. (\"-r\" kullanabilirsiniz)\n"
+
+#: g10/pkclist.c:863
+msgid "Enter the user ID: "
+msgstr "Özgün diziyi girin:"
+
+#: g10/pkclist.c:875
+msgid "No such user ID.\n"
+msgstr "Böyle bir özgün dizi yok.\n"
+
+#: g10/pkclist.c:880
+msgid "skipped: public key already set as default recipient\n"
+msgstr "atlandý: genel anahtar zaten öntanýmlý alýcý olarak ayarlanmýþ\n"
+
+#: g10/pkclist.c:903
+msgid "Public key is disabled.\n"
+msgstr "Genel anahtar iptal edildi.\n"
+
+#: g10/pkclist.c:910
+msgid "skipped: public key already set with --encrypt-to\n"
+msgstr "atlandý: genel anahtar --encrypt-to ile zaten ayarlanmýþ\n"
+
+#: g10/pkclist.c:941
+#, c-format
+msgid "unknown default recipient `%s'\n"
+msgstr "öntanýmlý alýcý \"%s\" bilinmiyor\n"
+
+#: g10/pkclist.c:974
+#, c-format
+msgid "%s: error checking key: %s\n"
+msgstr "%s: anahtar kontrol edilirken hata: %s\n"
+
+#: g10/pkclist.c:979
+#, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr "%s: atlandý: genel anahtar iptal edildi\n"
+
+#: g10/pkclist.c:1017
+msgid "no valid addressees\n"
+msgstr "geçerli adresler yok\n"
+
+#: g10/keygen.c:176
+msgid "writing self signature\n"
+msgstr "öz-imza yazýlýyor\n"
+
+#: g10/keygen.c:217
+msgid "writing key binding signature\n"
+msgstr "anahtarý garantileyen imzayý yazýyor\n"
+
+#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
+#, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr "anahtar uzunluðu geçersiz; %u bit kullanýlýyor\n"
+
+#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
+#, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr "anahtar uzunluðu %u bite yuvarlandý\n"
+
+#: g10/keygen.c:549
+msgid "Please select what kind of key you want:\n"
+msgstr "Lütfen istediðiniz anahtarý seçiniz:\n"
+
+#: g10/keygen.c:551
+#, c-format
+msgid "   (%d) DSA and ElGamal (default)\n"
+msgstr "   (%d) DSA ve ElGamal (öntanýmlý)\n"
+
+#: g10/keygen.c:552
+#, c-format
+msgid "   (%d) DSA (sign only)\n"
+msgstr "   (%d) DSA (yalnýz imzalamak için)\n"
+
+#: g10/keygen.c:554
+#, c-format
+msgid "   (%d) ElGamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (Yanýz þifrelemek için)\n"
+
+#: g10/keygen.c:555
+#, c-format
+msgid "   (%d) ElGamal (sign and encrypt)\n"
+msgstr "   (%d) ElGamal (imzalamak ve þifrelemek için)\n"
+
+#: g10/keygen.c:557
+#, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) RSA (imzalamak ve þifrelemek için)\n"
+
+#: g10/keygen.c:561
+msgid "Your selection? "
+msgstr "Seçiminiz? "
+
+#: g10/keygen.c:572
+msgid "Do you really want to create a sign and encrypt key? "
+msgstr "Bir imza ve þifreleme anahtarý yaratmayý gerçekten istiyor musunuz? "
+
+#: g10/keygen.c:580
+msgid "The use of this algorithm is deprecated - create anyway? "
+msgstr ""
+
+#: g10/keygen.c:594
+msgid "Invalid selection.\n"
+msgstr "Seçim geçersiz.\n"
+
+#: g10/keygen.c:606
+#, c-format
+msgid ""
+"About to generate a new %s keypair.\n"
+"              minimum keysize is  768 bits\n"
+"              default keysize is 1024 bits\n"
+"    highest suggested keysize is 2048 bits\n"
+msgstr ""
+"Yeni bir %s anahtar çifti üretmek üzeresiniz.\n"
+"                   en küçük anahtar uzunluðu:  768 bit\n"
+"                  öntanýmlý anahtar uzunluðu: 1024 bit\n"
+"    önerilebilecek en büyük anahtar uzunluðu: 2048 bit\n"
+
+#: g10/keygen.c:613
+msgid "What keysize do you want? (1024) "
+msgstr "Ýstediðiniz anahtar uzunluðu nedir? (1024) "
+
+#: g10/keygen.c:618
+msgid "DSA only allows keysizes from 512 to 1024\n"
+msgstr "DSA anahtarýnýn uzunluðu 512 ile 1024 bit arasýnda olabilir\n"
+
+#: g10/keygen.c:620
+msgid "keysize too small; 768 is smallest value allowed.\n"
+msgstr "anahtar uzunluðu çok küçük; en küçük anahtar uzunluðu 768 bit'tir.\n"
+
+#: g10/keygen.c:622
+msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+msgstr ""
+"anahtar uzunluðu çok küçük; RSA anahtarý için en küçük uzunluk: 1024 bit\n"
+
+#. It is ridiculous and an annoyance to use larger key sizes!
+#. * GnuPG can handle much larger sizes; but it takes an eternity
+#. * to create such a key (but less than the time the Sirius
+#. * Computer Corporation needs to process one of the usual
+#. * complaints) and {de,en}cryption although needs some time.
+#. * 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:633
+#, c-format
+msgid "keysize too large; %d is largest value allowed.\n"
+msgstr "anahtar uzunluðu çok büyük; izin verilen en büyük deðer: %d bit\n"
+
+#: g10/keygen.c:638
+msgid ""
+"Keysizes larger than 2048 are not suggested because\n"
+"computations take REALLY long!\n"
+msgstr ""
+"Hesaplama EPEYCE UZUN zaman alacaðýndan anahtar uzunluklarýnda 2048 bitten "
+"fazlasý tavsiye edilmez.\n"
+
+#: g10/keygen.c:641
+msgid "Are you sure that you want this keysize? "
+msgstr "Bu anahtar uzunluðunu istediðinizden emin misiniz? "
+
+#: g10/keygen.c:642
+msgid ""
+"Okay, but keep in mind that your monitor and keyboard radiation is also very "
+"vulnerable to attacks!\n"
+msgstr ""
+"Pekala, þimdi monitör ve klavyeden uzaklaþýn! Anahtar üretimi sýrasýndaki bu "
+"aygýtlardan yayýlacak radyasyon size zarar verebilir!\n"
+
+#: g10/keygen.c:650
+msgid "Do you really need such a large keysize? "
+msgstr "Bu kadar büyük anahtar uzunluðuna gerçekten ihtiyacýnýz var mý?"
+
+#: g10/keygen.c:656
+#, c-format
+msgid "Requested keysize is %u bits\n"
+msgstr "Ýstenen anahtar uzunluðu: %u bit\n"
+
+#: g10/keygen.c:659 g10/keygen.c:663
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "%u bite yuvarlandý\n"
+
+#: g10/keygen.c:711
+msgid ""
+"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"
+msgstr ""
+"Lütfen anahtarýn ne kadar süreyle geçerli olacaðýný belirtin.\n"
+"         0 = anahtar hayatýnýz boyunca geçerli\n"
+"      <n>  = anahtar n gün geçerli\n"
+"      <n>w = anahtar n hafta geçerli\n"
+"      <n>m = anahtar n ay geçerli\n"
+"      <n>y = anahtar n yýl geçerli\n"
+
+#: g10/keygen.c:726
+msgid "Key is valid for? (0) "
+msgstr "Anahtar ne kadar geçerli olacak? (0) "
+
+#: g10/keygen.c:731
+msgid "invalid value\n"
+msgstr "deðer hatalý\n"
+
+#: g10/keygen.c:736
+msgid "Key does not expire at all\n"
+msgstr "Anahtar hayatýnýz boyunca geçerli\n"
+
+#. print the date when the key expires
+#: g10/keygen.c:742
+#, c-format
+msgid "Key expires at %s\n"
+msgstr "Anahtarýn son kullanma tarihi: %s\n"
+
+#: g10/keygen.c:745
+msgid ""
+"Your system can't display dates beyond 2038.\n"
+"However, it will be correctly handled up to 2106.\n"
+msgstr ""
+"Sisteminiz 2038 yýlýndan sonraki tarihleri gösteremiyor.\n"
+"Ama emin olun ki 2106 yýlýna kadar elde edilebilecek.\n"
+
+#: g10/keygen.c:750
+msgid "Is this correct (y/n)? "
+msgstr "Bu doðru mu? (e/h)? "
+
+#: g10/keygen.c:793
+msgid ""
+"\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"
+msgstr ""
+"\n"
+"Anahtarýnýzý tanýmlamak için bir özgün dizi gerekiyor; Yazýlým bu özgün "
+"diziyi\n"
+"Adý Soyadý, Yorum ve Eposta adresi alanlarýndan\n"
+"    \"Fatih Sultan Mehmet (padisah) <fsmehmet@topkapi.tr>\"\n"
+"þeklinde oluþturur.\n"
+
+#: g10/keygen.c:805
+msgid "Real name: "
+msgstr "Adýnýz ve Soyadýnýz: "
+
+#: g10/keygen.c:813
+msgid "Invalid character in name\n"
+msgstr "Ad ve soyadýnýzda geçersiz karakter var\n"
+
+#: g10/keygen.c:815
+msgid "Name may not start with a digit\n"
+msgstr "Ad ve soyadýnýz bir rakamla baþlamamalý\n"
+
+#: g10/keygen.c:817
+msgid "Name must be at least 5 characters long\n"
+msgstr "Ad ve soyadýnýz en az 5 harfli olmalý\n"
+
+#: g10/keygen.c:825
+msgid "Email address: "
+msgstr "Eposta adresiniz: "
+
+#: g10/keygen.c:836
+msgid "Not a valid email address\n"
+msgstr "geçerli bir Eposta adresi deðil\n"
+
+#: g10/keygen.c:844
+msgid "Comment: "
+msgstr "Yorum: "
+
+#: g10/keygen.c:850
+msgid "Invalid character in comment\n"
+msgstr "Yorum alanýnda geçersiz karakter\n"
+
+#: g10/keygen.c:873
+#, c-format
+msgid "You are using the `%s' character set.\n"
+msgstr "\"%s\" karakter setini kullanýyorsunuz.\n"
+
+#: g10/keygen.c:879
+#, c-format
+msgid ""
+"You selected this USER-ID:\n"
+"    \"%s\"\n"
+"\n"
+msgstr ""
+"Seçtiðiniz ÖZGÜN DÝZÝ:\n"
+"    \"%s\"\n"
+"\n"
+
+#: g10/keygen.c:883
+msgid "Please don't put the email address into the real name or the comment\n"
+msgstr ""
+"Lütfen Eposta adresinizi Adý ve Soyadý veya Yorum alaný içine koymayýn\n"
+
+#: g10/keygen.c:888
+msgid "NnCcEeOoQq"
+msgstr "AaYyEeTtÇç"
+
+#: g10/keygen.c:898
+msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
+msgstr "(A)dý ve Soyadý, (Y)orum, (E)posta alanlarýný deðiþtir ya da (Ç)ýk? "
+
+#: g10/keygen.c:899
+msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
+msgstr ""
+"(A)dý ve Soyadý, (Y)orum, (E)posta alanlarýný deðiþtir ya da (T)amam/(Ç)ýk? "
+
+#: g10/keygen.c:918
+msgid "Please correct the error first\n"
+msgstr "Lütfen önce hatayý düzeltin\n"
+
+#: g10/keygen.c:956
+msgid ""
+"You need a Passphrase to protect your secret key.\n"
+"\n"
+msgstr ""
+"Gizli anahtarýnýzý korumak için bir anahtar parolasýna gereksiniminiz var.\n"
+"\n"
+
+#: g10/keyedit.c:469 g10/keygen.c:964
+msgid "passphrase not correctly repeated; try again.\n"
+msgstr "anahtar parolasý doðru olarak tekrarlanmadý; tekrar deneyin.\n"
+
+#: g10/keygen.c:970
+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"
+"using this program with the option \"--edit-key\".\n"
+"\n"
+msgstr ""
+"Bir anahtar parolasý istemediniz - bu *kötü* bir fikir!\n"
+"Nasýl isterseniz. Anahtar parolanýzý bu programý \"--edit-key\"\n"
+"seçeneði ile kullanarak her zaman deðiþtirebilirsiniz.\n"
+"\n"
+
+#: g10/keygen.c:991
+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"
+"disks) during the prime generation; this gives the random number\n"
+"generator a better chance to gain enough entropy.\n"
+msgstr ""
+"Bir miktar rasgele byte üretilmesi gerekiyor. Ýlk üretim sýrasýnda biraz\n"
+"hareket (klavyeyi kullanmak, fareyi hareket ettirmek, disklerden "
+"yaralanmak)\n"
+"iyi olacaktýr; bu yeterli ganimet kazanmak için rasgele sayý üretimine daha\n"
+"fazla þans verir.\n"
+
+#: g10/keygen.c:1440
+msgid "DSA keypair will have 1024 bits.\n"
+msgstr "DSA anahtar çifti 1024 bit olacak.\n"
+
+#: g10/keygen.c:1483
+msgid "Key generation canceled.\n"
+msgstr "Anahtar üretimi durduruldu.\n"
+
+#: g10/keygen.c:1581
+#, c-format
+msgid "writing public key to `%s'\n"
+msgstr "genel anahtarý \"%s\"e yazýyor\n"
+
+#: g10/keygen.c:1582
+#, c-format
+msgid "writing secret key to `%s'\n"
+msgstr "gizli anahtarý \"%s\"e yazýyor\n"
+
+#: g10/keygen.c:1679
+msgid "public and secret key created and signed.\n"
+msgstr "genel ve gizli anahtar üretildi ve imzalandý.\n"
+
+#: g10/keygen.c:1684
+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 ""
+"Bu anahtarýn þifreleme için kullanýlamayacaðýný bir kenara not edin.\n"
+"Þifrelemede kullanmak amacýyla ikinci bir anahtar üretmek isterseniz\n"
+"\"--edit-key\" seçeneðini kullanabilirsiniz.\n"
+
+#: g10/keygen.c:1701 g10/keygen.c:1807
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr "Anahtar üretimi baþarýsýzlýða uðradý: %s\n"
+
+#: g10/keygen.c:1748 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 "anahtar üretimi %lu saniye sürecek (zaman sapmasý veya hýz problemi)\n"
+
+#: g10/keygen.c:1750 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 ""
+"anahtar üretimi %lu saniye sürecek (zaman sapmasý ya da hýz problemi)\n"
+
+#: g10/keygen.c:1783
+msgid "Really create? "
+msgstr "Gerçekten yaratýlacak mý? "
+
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
+#: g10/tdbio.c:515
+#, c-format
+msgid "%s: can't open: %s\n"
+msgstr "%s: açýlamadý: %s\n"
+
+#: g10/encode.c:113
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "anahtar parolasý oluþturulurken hata: %s\n"
+
+#: g10/encode.c:171 g10/encode.c:327
+#, c-format
+msgid "%s: WARNING: empty file\n"
+msgstr "%s: UYARI: dosya boþ\n"
+
+#: g10/encode.c:274
+#, c-format
+msgid "reading from `%s'\n"
+msgstr "\"%s\"den okuyor\n"
+
+#: g10/encode.c:497
+#, c-format
+msgid "%s/%s encrypted for: %s\n"
+msgstr "%s/%s %s için þifrelendi\n"
+
+#: g10/export.c:153
+#, c-format
+msgid "%s: user not found: %s\n"
+msgstr "%s: kullanýcý bulunamadý: %s\n"
+
+#: g10/export.c:162
+#, c-format
+msgid "certificate read problem: %s\n"
+msgstr "sertifika okuma problemi: %s\n"
+
+#: g10/export.c:171
+#, c-format
+msgid "key %08lX: not a rfc2440 key - skipped\n"
+msgstr "%08lX anahtarý: bir RFC2440 anahtarý deðil - atlandý\n"
+
+#: g10/export.c:182
+#, c-format
+msgid "key %08lX: not protected - skipped\n"
+msgstr "%08lX anahtarý: korunmamýþ - atlandý\n"
+
+#: g10/export.c:236
+msgid "WARNING: nothing exported\n"
+msgstr "UYARI: hiçbir þey gönderilmedi\n"
+
+#: g10/getkey.c:214
+msgid "too many entries in pk cache - disabled\n"
+msgstr "pk belleðinde çok fazla girdi - iptal edildi\n"
+
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+msgid "[User id not found]"
+msgstr "[Özgün dizi bulunamadý]"
+
+#: g10/getkey.c:453
+msgid "too many entries in unk cache - disabled\n"
+msgstr "unk belleðinde çok fazla girdi - iptal edildi\n"
+
+#: g10/getkey.c:2207
+#, c-format
+msgid "using secondary key %08lX instead of primary key %08lX\n"
+msgstr "yardýmcý anahtar %08lX, asýl anahtar %08lX yerine kullanýlýyor\n"
+
+#: g10/getkey.c:2249 g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "%08lX anahtarý: genel anahtarsýz gizli anahtar - atlandý\n"
+
+#: g10/import.c:184
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "%d tipindeki blok atlandý\n"
+
+#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
+#, c-format
+msgid "%lu keys so far processed\n"
+msgstr "þu ana kadar herþey yolunda giderek %lu anahtar iþlenmiþ\n"
+
+#: g10/import.c:196
+#, c-format
+msgid "error reading `%s': %s\n"
+msgstr "\"%s\" okunurken hata: %s\n"
+
+#: g10/import.c:206
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "Ýþlenmiþ toplam miktar: %lu\n"
+
+#: g10/import.c:208
+#, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "      yeni anahtarlar atlandý: %lu\n"
+
+#: g10/import.c:211
+#, c-format
+msgid "          w/o user IDs: %lu\n"
+msgstr "          özgün dizi olmaksýzýn: %lu\n"
+
+#: g10/import.c:213
+#, c-format
+msgid "              imported: %lu"
+msgstr "              indirildi: %lu"
+
+#: g10/import.c:219
+#, c-format
+msgid "             unchanged: %lu\n"
+msgstr "             deðiþmedi: %lu\n"
+
+#: g10/import.c:221
+#, c-format
+msgid "          new user IDs: %lu\n"
+msgstr "          yeni özgün dizi: %lu\n"
+
+#: g10/import.c:223
+#, c-format
+msgid "           new subkeys: %lu\n"
+msgstr "           yeni yardýmcý anahtarlar: %lu\n"
+
+#: g10/import.c:225
+#, c-format
+msgid "        new signatures: %lu\n"
+msgstr "        yeni imzalar: %lu\n"
+
+#: g10/import.c:227
+#, c-format
+msgid "   new key revocations: %lu\n"
+msgstr "   yeni anahtar iptalleri: %lu\n"
+
+#: g10/import.c:229
+#, c-format
+msgid "      secret keys read: %lu\n"
+msgstr "      gizli anahtarlar okunuyor: %lu\n"
+
+#: g10/import.c:231
+#, c-format
+msgid "  secret keys imported: %lu\n"
+msgstr "  gizli anahtarlar indirildi: %lu\n"
+
+#: g10/import.c:233
+#, c-format
+msgid " secret keys unchanged: %lu\n"
+msgstr " gizli anahtarlar deðiþmedi: %lu\n"
+
+#: g10/import.c:408 g10/import.c:617
+#, c-format
+msgid "key %08lX: no user ID\n"
+msgstr "anahtar %08lX: özgün dizi yok\n"
+
+#: g10/import.c:422
+#, c-format
+msgid "key %08lX: no valid user IDs\n"
+msgstr "key %08lX: özgün dizi geçerli deðil\n"
+
+#: g10/import.c:424
+msgid "this may be caused by a missing self-signature\n"
+msgstr "bu kayýp bir öz-imza tarafýndan meydana gelebilir\n"
+
+#: g10/import.c:435 g10/import.c:684
+#, c-format
+msgid "key %08lX: public key not found: %s\n"
+msgstr "anahtar %08lX: genel anahtar bulunamadý: %s\n"
+
+#: g10/import.c:440
+#, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "anahtar %08lX: yeni anahtar - atlandý\n"
+
+#: g10/import.c:448
+msgid "no default public keyring\n"
+msgstr "genel anahtar demeti öntanýmlý deðil\n"
+
+#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
+#, c-format
+msgid "writing to `%s'\n"
+msgstr "\"%s\"e yazýyor\n"
+
+#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
+#, c-format
+msgid "can't lock keyring `%s': %s\n"
+msgstr "\"%s\" anahtar demeti kilitlenemez: %s\n"
+
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
+#, c-format
+msgid "error writing keyring `%s': %s\n"
+msgstr "\"%s\" anahtar demetini yazarken hata: %s\n"
+
+#: g10/import.c:463
+#, c-format
+msgid "key %08lX: public key imported\n"
+msgstr "anahtar %08lX: genel anahtar indirildi\n"
+
+#: g10/import.c:480
+#, c-format
+msgid "key %08lX: doesn't match our copy\n"
+msgstr "anahtar %08lX: bizim kopyamýzla eþleþmez\n"
+
+#: g10/import.c:489 g10/import.c:692
+#, c-format
+msgid "key %08lX: can't locate original keyblock: %s\n"
+msgstr "anahtar %08lX: özgün anahtar bloku yerleþtirilemedi: %s\n"
+
+#: g10/import.c:495 g10/import.c:698
+#, c-format
+msgid "key %08lX: can't read original keyblock: %s\n"
+msgstr "anahtar %08lX: özgün anahtar bloku okunamadý\n"
+
+#: g10/import.c:522
+#, c-format
+msgid "key %08lX: 1 new user ID\n"
+msgstr "anahtar %08lX: 1 yeni özgün dizi\n"
+
+#: g10/import.c:525
+#, c-format
+msgid "key %08lX: %d new user IDs\n"
+msgstr "anahtar %08lX: %d yeni özgün dizi\n"
+
+#: g10/import.c:528
+#, c-format
+msgid "key %08lX: 1 new signature\n"
+msgstr "anahtar %08lX: 1 yeni imza\n"
+
+#: g10/import.c:531
+#, c-format
+msgid "key %08lX: %d new signatures\n"
+msgstr "anahtar %08lX: %d yeni imza\n"
+
+#: g10/import.c:534
+#, c-format
+msgid "key %08lX: 1 new subkey\n"
+msgstr "anahtar %08lX: bir yeni yardýmcý anahtar\n"
+
+#: g10/import.c:537
+#, c-format
+msgid "key %08lX: %d new subkeys\n"
+msgstr "anahtar %08lX: %d yeni yardýmcý anahtar\n"
+
+#: g10/import.c:547
+#, c-format
+msgid "key %08lX: not changed\n"
+msgstr "anahtar %08lX: deðiþmedi\n"
+
+#: g10/import.c:610
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:640
+#, c-format
+msgid "key %08lX: secret key imported\n"
+msgstr "anahtar %08lX: gizli anahtar indirildi\n"
+
+#. we can't merge secret keys
+#: g10/import.c:644
+#, c-format
+msgid "key %08lX: already in secret keyring\n"
+msgstr "anahtar %08lX: zaten gizli anahtar demetinde\n"
+
+#: g10/import.c:649
+#, c-format
+msgid "key %08lX: secret key not found: %s\n"
+msgstr "anahtar %08lX: gizli anahtar bulunamadý: %s\n"
+
+#: g10/import.c:678
+#, c-format
+msgid "key %08lX: no public key - can't apply revocation certificate\n"
+msgstr ""
+"anahtar %08lX: genel anahtar deðil - yürürlükten kaldýrma sertifikasý "
+"uygulanamaz\n"
+
+#: g10/import.c:709
+#, c-format
+msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
+msgstr ""
+"anahtar %08lX: yürürlükten kaldýrma sertifikasý geçersiz: %s - reddedildi\n"
+
+#: g10/import.c:741
+#, c-format
+msgid "key %08lX: revocation certificate imported\n"
+msgstr "anahtar %08lX: yürürlükten kaldýrma sertifikasý indirildi\n"
+
+#: g10/import.c:783
+#, c-format
+msgid "key %08lX: no user ID for signature\n"
+msgstr "anahtar %08lX: imza için özgün dizi yok\n"
+
+#: g10/import.c:790 g10/import.c:814
+#, c-format
+msgid "key %08lX: unsupported public key algorithm\n"
+msgstr "anahtar %08lX: genel anahtar algoritmasý desteklenmiyor\n"
+
+#: g10/import.c:791
+#, c-format
+msgid "key %08lX: invalid self-signature\n"
+msgstr "anahtar %08lX: öz-imza geçersiz\n"
+
+#: g10/import.c:806
+#, c-format
+msgid "key %08lX: no subkey for key binding\n"
+msgstr "anahtar %08lX: anahtarý garantilemek için yardýmcý anahtar yok\n"
+
+#: g10/import.c:815
+#, c-format
+msgid "key %08lX: invalid subkey binding\n"
+msgstr "anahtar %08lX: yardýmcý anahtar garantileme geçersiz\n"
+
+#: g10/import.c:842
+#, c-format
+msgid "key %08lX: accepted non self-signed user ID '"
+msgstr "anahtar %08lX: öz-imzalý olmayan özgün dizi kabul edildi: '"
+
+#: g10/import.c:871
+#, c-format
+msgid "key %08lX: skipped user ID '"
+msgstr "anahtar %08lX: özgün dizi atlandý: '"
+
+#: g10/import.c:894
+#, c-format
+msgid "key %08lX: skipped subkey\n"
+msgstr "anahtar %08lX: yardýmcý anahtar atlandý\n"
+
+#. here we violate the rfc a bit by still allowing
+#. * to import non-exportable signature when we have the
+#. * the secret key used to create this signature - it
+#. * seems that this makes sense
+#: g10/import.c:919
+#, c-format
+msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
+msgstr "anahtar %08lX: imza gönderilebilir deðil (%02x sýnýfý) - atlandý\n"
+
+#: g10/import.c:928
+#, c-format
+msgid "key %08lX: revocation certificate at wrong place - skipped\n"
+msgstr ""
+"anahtar %08lX: yürürlükten kaldýrma sertifikasý yanlýþ yerde - atlandý\n"
+
+#: g10/import.c:936
+#, c-format
+msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
+msgstr ""
+"anahtar %08lX: yürürlükten kaldýrma sertifikasý geçersiz: %s - atlandý\n"
+
+#: g10/import.c:1036
+#, c-format
+msgid "key %08lX: duplicated user ID detected - merged\n"
+msgstr "anahtar %08lX: çift özgün kimlik saptandý - katýþtýrýldý\n"
+
+#: g10/import.c:1088
+#, c-format
+msgid "key %08lX: revocation certificate added\n"
+msgstr "anahtar %08lX: yürürlükten kaldýrma sertifikasý eklendi\n"
+
+#: g10/import.c:1202 g10/import.c:1255
+#, c-format
+msgid "key %08lX: our copy has no self-signature\n"
+msgstr "anahtar %08lX: bizim koya öz-imzaya sahip deðil\n"
+
+#: g10/delkey.c:67 g10/keyedit.c:94
+#, c-format
+msgid "%s: user not found\n"
+msgstr "%s: kullanýcý bulunamadý\n"
+
+#: g10/keyedit.c:156
+msgid "[revocation]"
+msgstr "[yürürlükten kaldýrma]"
+
+#: g10/keyedit.c:157
+msgid "[self-signature]"
+msgstr "[öz-imza]"
+
+#: g10/keyedit.c:221
+msgid "1 bad signature\n"
+msgstr "1 kötü imza\n"
+
+#: g10/keyedit.c:223
+#, c-format
+msgid "%d bad signatures\n"
+msgstr "%d kötü imza\n"
+
+#: g10/keyedit.c:225
+msgid "1 signature not checked due to a missing key\n"
+msgstr "1 imza kayýp bir anahtar yüzünden kontrol edilmedi\n"
+
+#: g10/keyedit.c:227
+#, c-format
+msgid "%d signatures not checked due to missing keys\n"
+msgstr "%d imza kayýp bir anahtar yüzünden kontrol edilmedi\n"
+
+#: g10/keyedit.c:229
+msgid "1 signature not checked due to an error\n"
+msgstr "1 imza bir hata yüzünden kontrol edilmedi\n"
+
+#: g10/keyedit.c:231
+#, c-format
+msgid "%d signatures not checked due to errors\n"
+msgstr "%d imza hatalardan dolayý kontrol edilmedi\n"
+
+#: g10/keyedit.c:233
+msgid "1 user ID without valid self-signature detected\n"
+msgstr "1 öz-imzasý geçersiz özgün dizi saptandý\n"
+
+#: g10/keyedit.c:235
+#, c-format
+msgid "%d user IDs without valid self-signatures detected\n"
+msgstr "%d öz-imzasý geçersiz özgün dizi saptandý\n"
+
+#. Fixme: see whether there is a revocation in which
+#. * case we should allow to sign it again.
+#: g10/keyedit.c:317
+#, c-format
+msgid "Already signed by key %08lX\n"
+msgstr "%08lX anahtarý tarafýndan zaten imzalanmýþ\n"
+
+#: g10/keyedit.c:325
+#, c-format
+msgid "Nothing to sign with key %08lX\n"
+msgstr "%08lX anahtarý ile imzalanan hiçbir þey yok\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Are you really sure that you want to sign this key\n"
+"with your key: \""
+msgstr ""
+"Bu anahtarý þu anahtarýnýzla imzalamak istediðinize gerçekten emin misiniz?: "
+"\""
+
+#: g10/keyedit.c:343
+msgid ""
+"The signature will be marked as non-exportable.\n"
+"\n"
+msgstr ""
+"Bu imza gönderilemez olarak iþaretlenmiþ olacak\n"
+"\n"
+
+#: g10/keyedit.c:348
+msgid "Really sign? "
+msgstr ""
+
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "imzalama baþarýsýz: %s\n"
+
+#: g10/keyedit.c:428
+msgid "This key is not protected.\n"
+msgstr "Bu anahtar korunmamýþ.\n"
+
+#: g10/keyedit.c:432
+msgid "Secret parts of primary key are not available.\n"
+msgstr "Asýl anahtarýn gizli parçalarý kullanýlamaz.\n"
+
+#: g10/keyedit.c:436
+msgid "Key is protected.\n"
+msgstr "Anahtar korunmuþ.\n"
+
+#: g10/keyedit.c:456
+#, c-format
+msgid "Can't edit this key: %s\n"
+msgstr "Bu anahtar üzerinde düzenleme yapýlamaz: %s\n"
+
+#: g10/keyedit.c:461
+msgid ""
+"Enter the new passphrase for this secret key.\n"
+"\n"
+msgstr ""
+"Bu gizli anahtar için yeni anahtar parolasý giriniz.\n"
+"\n"
+
+#: g10/keyedit.c:473
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"\n"
+msgstr ""
+
+#: g10/keyedit.c:476
+msgid "Do you really want to do this? "
+msgstr "Gerçekten bunu yapmak istiyor musunuz? "
+
+#: g10/keyedit.c:540
+msgid "moving a key signature to the correct place\n"
+msgstr "bir anahtar imzasýný doðru yere taþýyor\n"
+
+#: g10/keyedit.c:581
+msgid "quit this menu"
+msgstr "bu menuden çýk"
+
+#: g10/keyedit.c:582
+msgid "q"
+msgstr "ç"
+
+#: g10/keyedit.c:583
+msgid "save"
+msgstr "kaydet"
+
+#: g10/keyedit.c:583
+msgid "save and quit"
+msgstr "kaydet ve çýk"
+
+#: g10/keyedit.c:584
+msgid "help"
+msgstr "yardým"
+
+#: g10/keyedit.c:584
+msgid "show this help"
+msgstr "bunu gösterir "
+
+#: g10/keyedit.c:586
+msgid "fpr"
+msgstr "piz"
+
+#: g10/keyedit.c:586
+msgid "show fingerprint"
+msgstr "parmak izini göster"
+
+#: g10/keyedit.c:587
+msgid "list"
+msgstr "listele"
+
+#: g10/keyedit.c:587
+msgid "list key and user IDs"
+msgstr "anahtarý ve özgün diziyi göster"
+
+#: g10/keyedit.c:588
+msgid "l"
+msgstr "l"
+
+#: g10/keyedit.c:589
+msgid "uid"
+msgstr "ödz"
+
+#: g10/keyedit.c:589
+msgid "select user ID N"
+msgstr "N özgün dizi seçer"
+
+#: g10/keyedit.c:590
+msgid "key"
+msgstr "anahtar"
+
+#: g10/keyedit.c:590
+msgid "select secondary key N"
+msgstr "N yardýmcý anahtar seçer"
+
+#: g10/keyedit.c:591
+msgid "check"
+msgstr "kontrol"
+
+#: g10/keyedit.c:591
+msgid "list signatures"
+msgstr "imzalarý listele"
+
+#: g10/keyedit.c:592
+msgid "c"
+msgstr "k"
+
+#: g10/keyedit.c:593
+msgid "sign"
+msgstr "imzala"
+
+#: g10/keyedit.c:593
+msgid "sign the key"
+msgstr "anahtarý imzalar"
+
+#: g10/keyedit.c:594
+msgid "s"
+msgstr "i"
+
+#: g10/keyedit.c:595
+msgid "lsign"
+msgstr "yimza"
+
+#: g10/keyedit.c:595
+msgid "sign the key locally"
+msgstr "anahtarý yerel olarak imzala"
+
+#: g10/keyedit.c:596
+msgid "debug"
+msgstr "hata ayýklama"
+
+#: g10/keyedit.c:597
+msgid "adduid"
+msgstr "ödzekle"
+
+#: g10/keyedit.c:597
+msgid "add a user ID"
+msgstr "bir özgün dizi ekler"
+
+#: g10/keyedit.c:598
+msgid "deluid"
+msgstr "ödzsil"
+
+#: g10/keyedit.c:598
+msgid "delete user ID"
+msgstr "özgün diziyi siler"
+
+#: g10/keyedit.c:599
+msgid "addkey"
+msgstr "anhekle"
+
+#: g10/keyedit.c:599
+msgid "add a secondary key"
+msgstr "bir yardýmcý anahtar ekler"
+
+#: g10/keyedit.c:600
+msgid "delkey"
+msgstr "anhsil"
+
+#: g10/keyedit.c:600
+msgid "delete a secondary key"
+msgstr "bir yardýmcý anahtar siler"
+
+#: g10/keyedit.c:601
+msgid "delsig"
+msgstr "imzasil"
+
+#: g10/keyedit.c:601
+msgid "delete signatures"
+msgstr "imzalarý siler"
+
+#: g10/keyedit.c:602
+msgid "expire"
+msgstr "sontrh"
+
+#: g10/keyedit.c:602
+msgid "change the expire date"
+msgstr "son kullaným tarihini deðiþtirir"
+
+#: g10/keyedit.c:603
+msgid "toggle"
+msgstr "seçmece"
+
+#: g10/keyedit.c:603
+msgid "toggle between secret and public key listing"
+msgstr "genel ve gizli anahtar listeleri arasýnda yer deðiþtirir"
+
+#: g10/keyedit.c:605
+msgid "t"
+msgstr "b"
+
+#: g10/keyedit.c:606
+msgid "pref"
+msgstr "önayar"
+
+#: g10/keyedit.c:606 g10/keyedit.c:607
+msgid "list preferences"
+msgstr "önayarlarý listeler"
+
+#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "önayar"
+
+#: g10/keyedit.c:608
+msgid "passwd"
+msgstr "aparola"
+
+#: g10/keyedit.c:608
+msgid "change the passphrase"
+msgstr "anahtar parolasýný deðiþtirir"
+
+#: g10/keyedit.c:609
+msgid "trust"
+msgstr "büvence"
+
+#: g10/keyedit.c:609
+msgid "change the ownertrust"
+msgstr "sahibinigüvencesini deðiþtirir"
+
+#: g10/keyedit.c:610
+msgid "revsig"
+msgstr "imzafes"
+
+#: g10/keyedit.c:610
+msgid "revoke signatures"
+msgstr "imzalarý fesheder"
+
+#: g10/keyedit.c:611
+msgid "revkey"
+msgstr "anfes"
+
+#: g10/keyedit.c:611
+msgid "revoke a secondary key"
+msgstr "bir yardýmcý anahtarý yürürlükten kaldýrýr (fesheder)"
+
+#: g10/keyedit.c:612
+msgid "disable"
+msgstr "kaldýr"
+
+#: g10/keyedit.c:612
+msgid "disable a key"
+msgstr "bir anahtarý kullanýmdan kaldýrýr"
+
+#: g10/keyedit.c:613
+msgid "enable"
+msgstr "kullan"
+
+#: g10/keyedit.c:613
+msgid "enable a key"
+msgstr "bir anahtarý kullanýma sokar"
+
+#: g10/delkey.c:110 g10/keyedit.c:633
+msgid "can't do that in batchmode\n"
+msgstr "bu önceden belirlenmiþ iþlemler kipinde (in batchmode) yapýlamaz\n"
+
+#. check that they match
+#. fixme: check that they both match
+#: g10/keyedit.c:671
+msgid "Secret key is available.\n"
+msgstr "Gizli key kullanýþsýz.\n"
+
+#: g10/keyedit.c:700
+msgid "Command> "
+msgstr "Komut-> "
+
+#: g10/keyedit.c:730
+msgid "Need the secret key to do this.\n"
+msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
+
+#: g10/keyedit.c:734
+msgid "Please use the command \"toggle\" first.\n"
+msgstr "lütfen önce \"seçmece\" komutunu kullanýn.\n"
+
+#: g10/keyedit.c:781
+msgid "Really sign all user IDs? "
+msgstr "Tüm özgün diziler gerçekten imzalanacak mý? "
+
+#: g10/keyedit.c:782
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "Ýpucu: Ýmzalamak için bir özgün dizi seçiniz\n"
+
+#: g10/keyedit.c:814 g10/keyedit.c:1000
+#, c-format
+msgid "update of trustdb failed: %s\n"
+msgstr "güvence veritabanýnýn güncellenmesi baþarýsýz: %s\n"
+
+#: g10/keyedit.c:825 g10/keyedit.c:846
+msgid "You must select at least one user ID.\n"
+msgstr "En az bir özgün dizi seçmelisiniz.\n"
+
+#: g10/keyedit.c:827
+msgid "You can't delete the last user ID!\n"
+msgstr "Son özgün diziyi silemezsiniz!\n"
+
+#: g10/keyedit.c:830
+msgid "Really remove all selected user IDs? "
+msgstr "Seçilen tüm özgün diziler gerçekten silinecek mi? "
+
+#: g10/keyedit.c:831
+msgid "Really remove this user ID? "
+msgstr "Bu özgün dizi gerçekten silinecek mi? "
+
+#: g10/keyedit.c:867 g10/keyedit.c:889
+msgid "You must select at least one key.\n"
+msgstr "En az bir anahtar seçmelisiniz.\n"
+
+#: g10/keyedit.c:871
+msgid "Do you really want to delete the selected keys? "
+msgstr "Seçilen anahtarlarý gerçekten silmek istiyor musunuz? "
+
+#: g10/keyedit.c:872
+msgid "Do you really want to delete this key? "
+msgstr "Bu anahtarý gerçekten silmek istiyor musunuz? "
+
+#: g10/keyedit.c:893
+msgid "Do you really want to revoke the selected keys? "
+msgstr "Seçilen anahtarlarý gerçekten yürürlükten kaldýrmak istiyor musunuz? "
+
+#: g10/keyedit.c:894
+msgid "Do you really want to revoke this key? "
+msgstr "Bu anahtarý gerçekten yürürlükten kaldýrmak istiyor musunuz? "
+
+#: g10/keyedit.c:964
+msgid "Save changes? "
+msgstr "Deðiþiklikler kaydedilecek mi? "
+
+#: g10/keyedit.c:967
+msgid "Quit without saving? "
+msgstr "Kaydetmeden çýkýlsýn mý? "
+
+#: g10/keyedit.c:978
+#, c-format
+msgid "update failed: %s\n"
+msgstr "güncelleme baþarýsýz: %s\n"
+
+#: g10/keyedit.c:985
+#, c-format
+msgid "update secret failed: %s\n"
+msgstr "gizliyi güncelleme baþarýsýz: %s\n"
+
+#: g10/keyedit.c:992
+msgid "Key not changed so no update needed.\n"
+msgstr "güncelleme gereði olmadýðýndan anahtar deðiþmedi.\n"
+
+#: g10/keyedit.c:1007
+msgid "Invalid command  (try \"help\")\n"
+msgstr "Komut geçersiz (\"yardým\" komutunu deneyin)\n"
+
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
+#, c-format
+msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+msgstr "%s%c %4u%c/%08lX  üretildi: %s son kullanma tarihi: %s"
+
+#: g10/keyedit.c:1140
+#, c-format
+msgid " trust: %c/%c"
+msgstr "güvence:  %c/%c"
+
+#: g10/keyedit.c:1144
+msgid "This key has been disabled"
+msgstr "Bu anahtar kullanýmdan kaldýrýlmýþ"
+
+#: g10/keyedit.c:1173
+#, c-format
+msgid "rev! subkey has been revoked: %s\n"
+msgstr "fesh! yardýmcý anahtar yürürlükten kaldýrýlmýþ: %s\n"
+
+#: g10/keyedit.c:1176
+msgid "rev- faked revocation found\n"
+msgstr "fesh- sahte yürürlükten kaldýrma sertifikasý bulundu\n"
+
+#: g10/keyedit.c:1178
+#, c-format
+msgid "rev? problem checking revocation: %s\n"
+msgstr "fesh? yürürlükten kaldýrma kontrol edilirken problem: %s\n"
+
+#: g10/keyedit.c:1420
+msgid "Delete this good signature? (y/N/q)"
+msgstr "Bu doðru imza silinsin mi? (e/H/ç)"
+
+#: g10/keyedit.c:1424
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "Bu geçersiz imza silinsin mi? (e/H/ç"
+
+#: g10/keyedit.c:1428
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "Bu bilinmeyen imza silinsin mi? (e/H/ç"
+
+#: g10/keyedit.c:1434
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Bu öz-imza gerçekten silinecek mi? (e/H)"
+
+#: g10/keyedit.c:1448
+#, c-format
+msgid "Deleted %d signature.\n"
+msgstr "%d imza silindi.\n"
+
+#: g10/keyedit.c:1449
+#, c-format
+msgid "Deleted %d signatures.\n"
+msgstr "%d adet imza silindi.\n"
+
+#: g10/keyedit.c:1452
+msgid "Nothing deleted.\n"
+msgstr "Hiçbir þey silinmedi.\n"
+
+#: g10/keyedit.c:1521
+msgid "Please remove selections from the secret keys.\n"
+msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
+
+#: g10/keyedit.c:1527
+msgid "Please select at most one secondary key.\n"
+msgstr "Lütfen en fazla bir yardýmcý anahtar seçin.\n"
+
+#: g10/keyedit.c:1531
+msgid "Changing expiration time for a secondary key.\n"
+msgstr "Bir yardýmcý anahtar için son kullanma tarihi deðiþtiriliyor.\n"
+
+#: g10/keyedit.c:1533
+msgid "Changing expiration time for the primary key.\n"
+msgstr "Asýl anahtar için son kullanma tarihi deðiþtiriliyor.\n"
+
+#: g10/keyedit.c:1575
+msgid "You can't change the expiration date of a v3 key\n"
+msgstr "Bir v3 anahtarýnýn son kullanma tarihini deðiþtiremezsiniz\n"
+
+#: g10/keyedit.c:1591
+msgid "No corresponding signature in secret ring\n"
+msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
+
+#: g10/keyedit.c:1652
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "%d endeksiyle özgün dizi yok\n"
+
+#: g10/keyedit.c:1698
+#, c-format
+msgid "No secondary key with index %d\n"
+msgstr "%d endeksiyle yardýmcý anahtar yok\n"
+
+#: g10/keyedit.c:1796
+msgid "user ID: \""
+msgstr "özgün dizi: \""
+
+#: g10/keyedit.c:1799
+#, c-format
+msgid ""
+"\"\n"
+"signed with your key %08lX at %s\n"
+msgstr ""
+"\"\n"
+" %08lX anahtarýnýzla %s de imzalandý\n"
+
+#: g10/keyedit.c:1803
+msgid "Create a revocation certificate for this signature? (y/N)"
+msgstr ""
+"Bu imza için bir yürürlükten kaldýrma sertifikasý oluþturulsun mu? (e/H)"
+
+#. FIXME: detect duplicates here
+#: g10/keyedit.c:1827
+msgid "You have signed these user IDs:\n"
+msgstr "Bu özgün dizileri imzalamýþsýnýz:\n"
+
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
+#, c-format
+msgid "   signed by %08lX at %s\n"
+msgstr "   %08lX tarafýndan %s de imzalandý\n"
+
+#: g10/keyedit.c:1846
+#, c-format
+msgid "   revoked by %08lX at %s\n"
+msgstr "   %08lX tarafýndan %s de yürürlükten kaldýrýldý\n"
+
+#: g10/keyedit.c:1866
+msgid "You are about to revoke these signatures:\n"
+msgstr "Bu imzalarý yürürlükten kaldýrmak üzeresiniz\n"
+
+#: g10/keyedit.c:1884
+msgid "Really create the revocation certificates? (y/N)"
+msgstr ""
+"Bu yürürlükten kaldýrma sertifikalarýný gerçekten yaratacak mýsýnýz? (e/H)"
+
+#: g10/keyedit.c:1913
+msgid "no secret key\n"
+msgstr "gizli anahtar yok\n"
+
+#. of subkey
+#: g10/keylist.c:279 g10/mainproc.c:851
+#, c-format
+msgid " [expires: %s]"
+msgstr "[son kullanma tarihi: %s]"
+
+#: g10/mainproc.c:269
+#, c-format
+msgid "public key is %08lX\n"
+msgstr "genel anahtar: %08lX\n"
+
+#: g10/mainproc.c:314
+msgid "public key encrypted data: good DEK\n"
+msgstr "genel anahtar þifreli veri: doðru DEK\n"
+
+#: g10/mainproc.c:366
+#, c-format
+msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
+msgstr "%s anahtarý ve özgün dizi %08lX %u-bit ile þifrelendi, %s yaratýldý\n"
+
+#: g10/mainproc.c:376
+#, c-format
+msgid "encrypted with %s key, ID %08lX\n"
+msgstr "özgün dizi %08lX %s anahtarý ile þifrelendi\n"
+
+#: g10/mainproc.c:390
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "genel anahtar þifre çözümü baþarýsýz: %s\n"
+
+#: g10/mainproc.c:430
+msgid "decryption okay\n"
+msgstr "Þifre çözme tamam\n"
+
+#: g10/mainproc.c:435
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "UYARI: þifreli ileti tahrif edilmiþ!\n"
+
+#: g10/mainproc.c:440
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr "þifre çözme baþarýsýz: %s\n"
+
+#: g10/mainproc.c:459
+msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
+msgstr "NOT: gönderen \"yalnýz-gözleriniz-için\" ricada bulundu\n"
+
+#: g10/mainproc.c:461
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr "özgün dosya adý=\"%.*s\"\n"
+
+#: g10/mainproc.c:632
+msgid "standalone revocation - use \"gpg --import\" to apply\n"
+msgstr ""
+"tekbaþýna yürürlükten kaldýrma - uygulamak için \"gpg --import\" kullanýn\n"
+
+#: g10/mainproc.c:719 g10/mainproc.c:728
+msgid "WARNING: invalid notation data found\n"
+msgstr "UYARI: geçersiz niteleme verisi bulundu\n"
+
+#: g10/mainproc.c:731
+msgid "Notation: "
+msgstr "Niteleme: "
+
+#: g10/mainproc.c:740
+msgid "Policy: "
+msgstr "Güvenlik: "
+
+#: g10/mainproc.c:1193
+msgid "signature verification suppressed\n"
+msgstr "imza doðrulama bastýrýldý\n"
+
+#. plaintext before signatures but no one-pass packets
+#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#, fuzzy
+msgid "can't handle these multiple signatures\n"
+msgstr "açýkça okunabilen imzalar dahil edildi\n"
+
+#: g10/mainproc.c:1256
+#, c-format
+msgid "Signature made %.*s using %s key ID %08lX\n"
+msgstr "%s anahtarý ve %08lX özgün dizisi ile %.*s imzasý yapýldý\n"
+
+#. just in case that we have no userid
+#: g10/mainproc.c:1284 g10/mainproc.c:1292
+msgid "BAD signature from \""
+msgstr "KÖTÜ imza: \""
+
+#: g10/mainproc.c:1285 g10/mainproc.c:1293
+msgid "Good signature from \""
+msgstr "Doðru imza: \""
+
+#: g10/mainproc.c:1308
+msgid "                aka \""
+msgstr "                den \""
+
+#: g10/mainproc.c:1358
+#, c-format
+msgid "Can't check signature: %s\n"
+msgstr "Ýmza kontrol edilemedi: %s\n"
+
+#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "baðýmsýz bir imza yapar"
+
+#: g10/mainproc.c:1454
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "0x%02x sýnýfý tekbaþýna imza\n"
+
+#: g10/mainproc.c:1511
+msgid "old style (PGP 2.x) signature\n"
+msgstr "eski stil (PGP 2.x) imza\n"
+
+#: g10/mainproc.c:1518
+msgid "invalid root packet detected in proc_tree()\n"
+msgstr "proc_tree() içinde geçersiz kök paket saptandý\n"
+
+#: g10/misc.c:98
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "\"core dumps\" iptal edilemedi: %s\n"
+
+#: g10/misc.c:208
+msgid "Experimental algorithms should not be used!\n"
+msgstr "Deneyimsel algoritmalar kullanýlmayacaktý!\n"
+
+#: g10/misc.c:238
+#, fuzzy
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+msgstr ""
+"bu cipher algoritmasýnýn deðeri düþük; lütfem daha standard birini kullan!\n"
+
+#: g10/parse-packet.c:119
+#, c-format
+msgid "can't handle public key algorithm %d\n"
+msgstr "%d genel anahtar algoritmasý elde edilemedi\n"
+
+#: g10/parse-packet.c:1010
+#, c-format
+msgid "subpacket of type %d has critical bit set\n"
+msgstr "%d tipi altpaket kritik bit setine sahip\n"
+
+#: g10/passphrase.c:223
+msgid "gpg-agent is not available in this session\n"
+msgstr ""
+
+#: g10/passphrase.c:229
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr ""
+
+#: g10/hkp.c:167 g10/passphrase.c:248
+#, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "\"%s\" sunucusuna baðlanýlamadý: %s\n"
+
+#: g10/passphrase.c:313 g10/passphrase.c:576
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr " (asýl anahtar kimliði %08lX)"
+
+#: g10/passphrase.c:323
+#, fuzzy, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"\n"
+"Gizli anahtarýn kilidini açmak için bir anahtar parolasýna ihtiyacýnýz var.\n"
+"Anahtarýn sahibi: \""
+
+#: g10/passphrase.c:344
+#, fuzzy
+msgid "Enter passphrase\n"
+msgstr "Anahtar parolasýný girin: "
+
+#: g10/passphrase.c:346
+#, fuzzy
+msgid "Repeat passphrase\n"
+msgstr "Tekrar:"
+
+#: g10/passphrase.c:384
+msgid "passphrase too long\n"
+msgstr ""
+
+#: g10/passphrase.c:396
+msgid "invalid response from agent\n"
+msgstr ""
+
+#: g10/passphrase.c:405
+msgid "cancelled by user\n"
+msgstr ""
+
+#: g10/passphrase.c:408 g10/passphrase.c:477
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr ""
+
+#: g10/passphrase.c:562
+msgid ""
+"\n"
+"You need a passphrase to unlock the secret key for\n"
+"user: \""
+msgstr ""
+"\n"
+"Gizli anahtarýn kilidini açmak için bir anahtar parolasýna ihtiyacýnýz var.\n"
+"Anahtarýn sahibi: \""
+
+#: g10/passphrase.c:571
+#, c-format
+msgid "%u-bit %s key, ID %08lX, created %s"
+msgstr "%u-bit %s anahtarý, kimlik: %08lX, yaratýldý %s"
+
+#: g10/passphrase.c:609
+msgid "can't query password in batchmode\n"
+msgstr "önceden tanýmlanmýþ iþlemler kipinde (batchmode) parola sorgulanamaz\n"
+
+#: g10/passphrase.c:613
+msgid "Enter passphrase: "
+msgstr "Anahtar parolasýný girin: "
+
+#: g10/passphrase.c:617
+msgid "Repeat passphrase: "
+msgstr "Tekrar:"
+
+#: g10/plaintext.c:67
+msgid "data not saved; use option \"--output\" to save it\n"
+msgstr "veri kaydedilmedi; kaydetmek için \"--output\" seçeneðni kullanýn\n"
+
+#: g10/plaintext.c:332
+msgid "Detached signature.\n"
+msgstr "Baðýmsýz imza.\n"
+
+#: g10/plaintext.c:336
+msgid "Please enter name of data file: "
+msgstr "Lütfen veri dosyasýnýn ismini girin: "
+
+#: g10/plaintext.c:357
+msgid "reading stdin ...\n"
+msgstr "standard girdiden okuyor ...\n"
+
+#: g10/plaintext.c:391
+#, fuzzy
+msgid "no signed data\n"
+msgstr "imzalý veri: %s  açýlamadý\n"
+
+#: g10/plaintext.c:399
+#, c-format
+msgid "can't open signed data `%s'\n"
+msgstr "imzalý veri: %s  açýlamadý\n"
+
+#: g10/pubkey-enc.c:76
+#, c-format
+msgid "anonymous receiver; trying secret key %08lX ...\n"
+msgstr "anonim alýcý; %08lX gizli anahtarýný deneniyor ...\n"
+
+#: g10/pubkey-enc.c:82
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "tamam, biz anonim alýcýyýz.\n"
+
+#: g10/pubkey-enc.c:134
+msgid "old encoding of the DEK is not supported\n"
+msgstr "DEK'in eski kodlamasý desteklenmiyor\n"
+
+#: g10/pubkey-enc.c:153
+#, c-format
+msgid "cipher algorithm %d is unknown or disabled\n"
+msgstr "%d cipher algoritmasý bilinmiyor ya da kullaným dýþý\n"
+
+#: g10/pubkey-enc.c:192
+#, c-format
+msgid "NOTE: cipher algorithm %d not found in preferences\n"
+msgstr "NOT: %d cipher algoritmasý önayarlarda bulunamadý\n"
+
+#: g10/pubkey-enc.c:198
+#, c-format
+msgid "NOTE: secret key %08lX expired at %s\n"
+msgstr "NOT: %08lX gizli anahtarýnýn %s tarihinde kullaným süresi doldu\n"
+
+#: g10/hkp.c:59
+#, c-format
+msgid "requesting key %08lX from %s ...\n"
+msgstr "%s den %08lX anahtarý isteniyor ...\n"
+
+#: g10/hkp.c:83
+#, c-format
+msgid "can't get key from keyserver: %s\n"
+msgstr "%s anahtar sunucusundan anahtar alýnamadý\n"
+
+#: g10/hkp.c:102 g10/hkp.c:136
+msgid "no keyserver known (use option --keyserver)\n"
+msgstr "anahtar sunucu bilinmiyor (--keyserver seçeneði ile belirtin)\n"
+
+#: g10/hkp.c:110
+#, c-format
+msgid "%s: not a valid key ID\n"
+msgstr "%s: geçerli bir anahtar kimliði deðil\n"
+
+#: g10/hkp.c:191
+#, c-format
+msgid "error sending to `%s': %s\n"
+msgstr "\"%s\" sunucusuna gönderme hatasý: %s\n"
+
+#: g10/hkp.c:203
+#, c-format
+msgid "success sending to `%s' (status=%u)\n"
+msgstr "\"%s\" sunucusuna gönderme iþlemi baþarýlý (durum=%u)\n"
+
+#: g10/hkp.c:206
+#, c-format
+msgid "failed sending to `%s': status=%u\n"
+msgstr "\"%s\" sunucusuna gönderme iþlemi baþarýsýz (durum=%u)\n"
+
+#: g10/seckey-cert.c:53
+msgid "secret key parts are not available\n"
+msgstr "gizli anahtar parçalarý kullaným dýþý\n"
+
+#: g10/seckey-cert.c:59
+#, c-format
+msgid "protection algorithm %d is not supported\n"
+msgstr "%d koruma algoritmasý desteklenmiyor\n"
+
+#: g10/seckey-cert.c:184
+msgid "Invalid passphrase; please try again ...\n"
+msgstr "Anahtar parolasý geçersiz; lütfen tekrar deneyin ...\n"
+
+#: g10/seckey-cert.c:240
+msgid "WARNING: Weak key detected - please change passphrase again.\n"
+msgstr ""
+"UYARI: Zayýf anahtar saptandý - lütfen anahtar parolasýný tekrar "
+"deðiþtirin.\n"
+
+#: g10/sig-check.c:199
+msgid "assuming bad MDC due to an unknown critical bit\n"
+msgstr "Hatalý MDC'nin bilinmeyen bir kritik bitten kaynaklandýðý sanýlýyor\n"
+
+#: g10/sig-check.c:297
+msgid ""
+"this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
+msgstr "Bu, imzalar için güvenli olmayan PGP üretimi bir ElGamal anahtarý!\n"
+
+#: g10/sig-check.c:305
+#, c-format
+msgid "public key is %lu second newer than the signature\n"
+msgstr "genel anahtar imzadan %lu saniye daha yeni\n"
+
+#: g10/sig-check.c:306
+#, c-format
+msgid "public key is %lu seconds newer than the signature\n"
+msgstr "genel anahtar imzadan %lu saniye daha yeni.\n"
+
+#: g10/sig-check.c:328
+#, fuzzy, c-format
+msgid "NOTE: signature key %08lX expired %s\n"
+msgstr "NOTE: imza anahtarýnýn kullaným süresi %s tarihinde dolmuþ\n"
+
+#: g10/sig-check.c:398
+msgid "assuming bad signature due to an unknown critical bit\n"
+msgstr "Hatalý imzanýn bilinmeyen bir kritik bitten kaynaklandýðý sanýlýyor\n"
+
+#: g10/sign.c:152
+#, fuzzy, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "Ýmza kontrol edilemedi: %s\n"
+
+#: g10/sign.c:161
+#, c-format
+msgid "%s signature from: %s\n"
+msgstr "%s imza: %s den\n"
+
+#: g10/sign.c:307 g10/sign.c:630
+#, c-format
+msgid "can't create %s: %s\n"
+msgstr "%s yaratýlamadý: %s\n"
+
+#: g10/sign.c:405
+msgid "signing:"
+msgstr "imzalanýyor:"
+
+#: g10/sign.c:448
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "UYARI: \"%s\" dosyasý boþ\n"
+
+#: g10/textfilter.c:134
+#, c-format
+msgid "can't handle text lines longer than %d characters\n"
+msgstr "%d karakterden daha uzun metin satýrlarý okunamaz\n"
+
+#: g10/textfilter.c:231
+#, c-format
+msgid "input line longer than %d characters\n"
+msgstr "girdi satýrý %d karakterden daha uzun\n"
+
+#: g10/tdbio.c:116 g10/tdbio.c:1623
+#, c-format
+msgid "trustdb rec %lu: lseek failed: %s\n"
+msgstr "güvence veritabaný %lu kaydý: sýralama baþarýsýz: %s\n"
+
+#: g10/tdbio.c:122 g10/tdbio.c:1630
+#, c-format
+msgid "trustdb rec %lu: write failed (n=%d): %s\n"
+msgstr "güvence veritabaný %lu kaydý: yazma baþarýsýz: %s\n"
+
+#: g10/tdbio.c:232
+msgid "trustdb transaction too large\n"
+msgstr "güvence veritabaný iþlemi çok uzun\n"
+
+#: g10/tdbio.c:424
+#, c-format
+msgid "%s: can't access: %s\n"
+msgstr "%s: eriþilemedi: %s\n"
+
+#: g10/tdbio.c:438
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: dizin yok!\n"
+
+#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s: yaratýlamadý: %s\n"
+
+#: g10/tdbio.c:459 g10/tdbio.c:508
+#, c-format
+msgid "%s: can't create lock\n"
+msgstr "%s: kilit yaratýlamadý\n"
+
+#: g10/tdbio.c:473
+#, c-format
+msgid "%s: failed to create version record: %s"
+msgstr "%s: sürüm kaydý yaratmada baþarýsýz: %s"
+
+#: g10/tdbio.c:477
+#, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr "%s: geçersiz güvence veritabaný yaratýldý\n"
+
+#: g10/tdbio.c:480
+#, c-format
+msgid "%s: trustdb created\n"
+msgstr "&s: güvence veritabaný yaratýldý\n"
+
+#: g10/tdbio.c:517
+#, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "%s: güvence veritabaný geçersiz\n"
+
+#: g10/tdbio.c:550
+#, c-format
+msgid "%s: failed to create hashtable: %s\n"
+msgstr "%s: hash tablosu yaratma baþarýsýz: %s\n"
+
+#: g10/tdbio.c:558
+#, c-format
+msgid "%s: error updating version record: %s\n"
+msgstr "%s: sürüm kaydýnýn güncellenmesinde hata: %s\n"
+
+#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
+#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
+#, c-format
+msgid "%s: error reading version record: %s\n"
+msgstr "%s: sürüm kaydýnýn okunmasýnda hata: %s\n"
+
+#: g10/tdbio.c:587 g10/tdbio.c:646
+#, c-format
+msgid "%s: error writing version record: %s\n"
+msgstr "%s: sürüm kaydýnýn yazýlmasýnda hata: %s\n"
+
+#: g10/tdbio.c:1235
+#, c-format
+msgid "trustdb: lseek failed: %s\n"
+msgstr "güvence veritabaný: sýralama baþarýsýz: %s\n"
+
+#: g10/tdbio.c:1243
+#, c-format
+msgid "trustdb: read failed (n=%d): %s\n"
+msgstr "güvence veritabaný: okuma baþarýsýz (n=%d): %s\n"
+
+#: g10/tdbio.c:1264
+#, c-format
+msgid "%s: not a trustdb file\n"
+msgstr "%s: bir güvence veritabaný dosyasý deðil\n"
+
+#: g10/tdbio.c:1280
+#, c-format
+msgid "%s: version record with recnum %lu\n"
+msgstr "%s: %lu kayýt numarasý ile sürüm kaydý\n"
+
+#: g10/tdbio.c:1285
+#, c-format
+msgid "%s: invalid file version %d\n"
+msgstr "%s: dosya sürümü %d geçersiz\n"
+
+#: g10/tdbio.c:1589
+#, c-format
+msgid "%s: error reading free record: %s\n"
+msgstr "%s: serbest kaydý okuma hatasý: %s\n"
+
+#: g10/tdbio.c:1597
+#, c-format
+msgid "%s: error writing dir record: %s\n"
+msgstr "%s: dizin kaydýný yazma hatasý: %s\n"
+
+#: g10/tdbio.c:1607
+#, c-format
+msgid "%s: failed to zero a record: %s\n"
+msgstr "%s: kayýt sýfýrlama baþarýsýz: %s\n"
+
+#: g10/tdbio.c:1637
+#, c-format
+msgid "%s: failed to append a record: %s\n"
+msgstr "%s: kayýt ekleme baþarýsýz: %s\n"
+
+#: g10/tdbio.c:1748
+msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+msgstr ""
+"güvence veritabaný bozulmuþ; lutfen \"gpg --fix-trustdb\" çalýþtýrýn.\n"
+
+#: g10/trustdb.c:169
+#, c-format
+msgid "trust record %lu, req type %d: read failed: %s\n"
+msgstr "güvence veritabaný kaydý %lu, istek tipi %d: okuma baþarýsýz: %s\n"
+
+#: g10/trustdb.c:184
+#, c-format
+msgid "trust record %lu, type %d: write failed: %s\n"
+msgstr "güvence veritabaný kaydý %lu, tip %d: yazma baþarýsýz: %s\n"
+
+#: g10/trustdb.c:198
+#, c-format
+msgid "trust record %lu: delete failed: %s\n"
+msgstr "güvence veritabaný kaydý %lu: silme baþarýsýz: %s\n"
+
+#: g10/trustdb.c:212
+#, c-format
+msgid "trustdb: sync failed: %s\n"
+msgstr "güvence veritabaný: senronizasyon baþarýsýz: %s\n"
+
+#: g10/trustdb.c:377
+#, c-format
+msgid "error reading dir record for LID %lu: %s\n"
+msgstr "LID %lu için dizin kaydýný okumada hata: %s\n"
+
+#: g10/trustdb.c:384
+#, c-format
+msgid "lid %lu: expected dir record, got type %d\n"
+msgstr "lid %lu: dizin kaydýnýn %d tipinde alýndýðý sanýlýyor\n"
+
+#: g10/trustdb.c:389
+#, c-format
+msgid "no primary key for LID %lu\n"
+msgstr "LID %lu için asýl anahtar yok\n"
+
+#: g10/trustdb.c:394
+#, c-format
+msgid "error reading primary key for LID %lu: %s\n"
+msgstr "LID %lu için asýl anahtarý okuma hatasý: %s\n"
+
+#: g10/trustdb.c:433
+#, c-format
+msgid "get_dir_record: search_record failed: %s\n"
+msgstr "get_dir_record:  search_record baþarýsýz: %s\n"
+
+#: g10/trustdb.c:474
+#, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "\"%s\" geçerli uzunlukta bir özgün dizi deðil\n"
+
+#: g10/trustdb.c:501
+#, c-format
+msgid "key %08lX: can't put it into the trustdb\n"
+msgstr "%08lX anahtarý: güvence veritabanýna yerleþtirilemedi\n"
+
+#: g10/trustdb.c:507
+#, c-format
+msgid "key %08lX: query record failed\n"
+msgstr "%08lX anahtarý: kayýt sorgulama baþarýsýz\n"
+
+#: g10/trustdb.c:516
+#, c-format
+msgid "key %08lX: already in trusted key table\n"
+msgstr "%08lX anahtarý: zaten güvenceli anahtarlar tablosunda\n"
+
+#: g10/trustdb.c:519
+#, c-format
+msgid "key %08lX: accepted as trusted key.\n"
+msgstr "%08lX anahtarý: güvenceli bir anahtar olarak kabul edildi.\n"
+
+#: g10/trustdb.c:546
+#, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "%08lX anahtarý: güvenceli anahtar için genel anahtar yok - atlandý\n"
+
+#: g10/trustdb.c:565
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "NOT: %08lX gizli anahtarý korunmuþ DEÐÝL.\n"
+
+#: g10/trustdb.c:584
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr "%08lX anahtarý: gizli ve genel anahtarlar eþleþmiyor\n"
+
+#: g10/trustdb.c:597
+#, c-format
+msgid "enumerate secret keys failed: %s\n"
+msgstr "gizli anahtarlarýn numaralanmasý baþarýsýz: %s\n"
+
+#: g10/trustdb.c:987
+#, c-format
+msgid "key %08lX.%lu: Good subkey binding\n"
+msgstr "anahtar %08lX.%lu: Doðru yardýmcý anahtar baðlantýsý\n"
+
+#: g10/trustdb.c:993 g10/trustdb.c:1028
+#, c-format
+msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
+msgstr "anahtar %08lX.%lu: Yardýmcý anahtar baðlantýsý geçersiz: %s\n"
+
+#: g10/trustdb.c:1005
+#, c-format
+msgid "key %08lX.%lu: Valid key revocation\n"
+msgstr "anahtar %08lX.%lu: anahtarýn yürürlükten kaldýrýlmasý geçerli\n"
+
+#: g10/trustdb.c:1011
+#, c-format
+msgid "key %08lX.%lu: Invalid key revocation: %s\n"
+msgstr "anahtar %08lX.%lu: anahtarýn yürürlükten kaldýrýlmasý geçersiz\n"
+
+#: g10/trustdb.c:1022
+#, c-format
+msgid "key %08lX.%lu: Valid subkey revocation\n"
+msgstr ""
+"anahtar %08lX.%lu: yardýmcý anahtarýn yürürlükten kaldýrýlmasý geçerli\n"
+
+#: g10/trustdb.c:1133
+msgid "Good self-signature"
+msgstr "Doðru öz-imza"
+
+#: g10/trustdb.c:1143
+msgid "Invalid self-signature"
+msgstr "Geçersiz öz-imza"
+
+#: g10/trustdb.c:1170
+msgid "Valid user ID revocation skipped due to a newer self signature"
+msgstr ""
+"Daha yeni bir öz-imzadan dolayý özgün dizi için geçerli yürürlükten kaldýrma "
+"atlandý"
+
+#: g10/trustdb.c:1176
+msgid "Valid user ID revocation"
+msgstr "Özgün dizi için geçerli yürürlükten kaldýrma"
+
+#: g10/trustdb.c:1181
+msgid "Invalid user ID revocation"
+msgstr "Özgün dizi için geçersiz yürürlükten kaldýrma"
+
+#: g10/trustdb.c:1223
+msgid "Valid certificate revocation"
+msgstr "Sertifika için geçerli yürürlükten kaldýrma"
+
+#: g10/trustdb.c:1224
+msgid "Good certificate"
+msgstr "Doðru sertifika"
+
+#: g10/trustdb.c:1252
+msgid "Invalid certificate revocation"
+msgstr "Sertifika için geçersiz yürürlükten kaldýrma"
+
+#: g10/trustdb.c:1253
+msgid "Invalid certificate"
+msgstr "Geçersiz sertifika"
+
+#: g10/trustdb.c:1270 g10/trustdb.c:1274
+#, c-format
+msgid "sig record %lu[%d] points to wrong record.\n"
+msgstr "imza kaydý %lu[%d] yanlýþ kayda gönderiyor.\n"
+
+#: g10/trustdb.c:1333
+msgid "duplicated certificate - deleted"
+msgstr "kopyalanmýþ sertifika - silindi"
+
+#: g10/trustdb.c:1650
+#, c-format
+msgid "tdbio_search_dir failed: %s\n"
+msgstr "tdbio_search_dir baþarýsýz: %s\n"
+
+#: g10/trustdb.c:1784
+#, c-format
+msgid "lid ?: insert failed: %s\n"
+msgstr "LID ?: yerleþtirme baþarýsýz: %s\n"
+
+#: g10/trustdb.c:1789
+#, c-format
+msgid "lid %lu: insert failed: %s\n"
+msgstr "LID %lu: yerleþtirme baþarýsýz: %s\n"
+
+#: g10/trustdb.c:1795
+#, c-format
+msgid "lid %lu: inserted\n"
+msgstr "LID %lu: yerleþtirildi\n"
+
+#: g10/trustdb.c:1800
+#, c-format
+msgid "error reading dir record: %s\n"
+msgstr "dizin kaydýný okumada hata: %s\n"
+
+#: g10/trustdb.c:1808 g10/trustdb.c:1871
+#, c-format
+msgid "%lu keys processed\n"
+msgstr "%lu anahtar iþlendi\n"
+
+#: g10/trustdb.c:1810 g10/trustdb.c:1877
+#, c-format
+msgid "\t%lu keys with errors\n"
+msgstr "\t%lu anahtar hatalý\n"
+
+#: g10/trustdb.c:1812
+#, c-format
+msgid "\t%lu keys inserted\n"
+msgstr "\t%lu anahtar yerleþtirildi\n"
+
+#: g10/trustdb.c:1815
+#, c-format
+msgid "enumerate keyblocks failed: %s\n"
+msgstr "anahtar bloklarýnýn numaralanmasý baþarýsýz: %s\n"
+
+#: g10/trustdb.c:1863
+#, c-format
+msgid "lid %lu: dir record w/o key - skipped\n"
+msgstr "LID %lu: dizin kaydý anahtarsýz - atlandý\n"
+
+#: g10/trustdb.c:1873
+#, c-format
+msgid "\t%lu due to new pubkeys\n"
+msgstr "\t%lu genel anahtardan dolayý\n"
+
+#: g10/trustdb.c:1875
+#, c-format
+msgid "\t%lu keys skipped\n"
+msgstr "\t%lu anahtar atlandý\n"
+
+#: g10/trustdb.c:1879
+#, c-format
+msgid "\t%lu keys updated\n"
+msgstr "\t%lu anahtar güncellendi\n"
+
+#: g10/trustdb.c:2224
+msgid "Ooops, no keys\n"
+msgstr "Hooop, anahtarlar yok\n"
+
+#: g10/trustdb.c:2228
+msgid "Ooops, no user IDs\n"
+msgstr "Hooop, özgün dizi yok\n"
+
+#: g10/trustdb.c:2386
+#, c-format
+msgid "check_trust: search dir record failed: %s\n"
+msgstr "check_trust: dizin kaydýnýn aranmasý baþarýsýz: %s\n"
+
+#: g10/trustdb.c:2395
+#, c-format
+msgid "key %08lX: insert trust record failed: %s\n"
+msgstr "%08lX anahtarý: güvence kaydýnýn yerleþtirilmesi baþarýsýz: %s\n"
+
+#: g10/trustdb.c:2399
+#, c-format
+msgid "key %08lX.%lu: inserted into trustdb\n"
+msgstr "anahtar %08lX.%lu: güvence veritabanýna yerleþtirildi\n"
+
+#: g10/trustdb.c:2407
+#, c-format
+msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
+msgstr ""
+"anahtar %08lX.%lu: ilerde yaratýlacak (zaman sapmasý ya da hýz problemi)\n"
+
+#: g10/trustdb.c:2422
+#, c-format
+msgid "key %08lX.%lu: expired at %s\n"
+msgstr "anahtar %08lX.%lu: %s tarihinde kullaným süresi doldu\n"
+
+#: g10/trustdb.c:2430
+#, c-format
+msgid "key %08lX.%lu: trust check failed: %s\n"
+msgstr "anahtar %08lX.%lu: güvence kontrolu baþarýsýz: %s\n"
+
+#: g10/trustdb.c:2581
+#, c-format
+msgid "user '%s' not found: %s\n"
+msgstr "kullanýcý \"%s\" bulunamadý: %s\n"
+
+#: g10/trustdb.c:2583
+#, c-format
+msgid "problem finding '%s' in trustdb: %s\n"
+msgstr "\"%s\"in güvence veritabanýnda bulunmasýnda problem: %s\n"
+
+#: g10/trustdb.c:2586
+#, c-format
+msgid "user '%s' not in trustdb - inserting\n"
+msgstr "kullanýcý \"%s\" güvence veritabanýnda deðil - yerleþtirildi\n"
+
+#: g10/trustdb.c:2589
+#, c-format
+msgid "failed to put '%s' into trustdb: %s\n"
+msgstr "\"%s\"in güvence veritabanýna konulmasý baþarýsýz: %s\n"
+
+#: g10/trustdb.c:2775 g10/trustdb.c:2805
+msgid "WARNING: can't yet handle long pref records\n"
+msgstr "UYARI: uzun önayarlar kayýtlarý henüz elde edilemedi\n"
+
+#: g10/verify.c:108
+msgid ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+msgstr ""
+"imza doðrulanamadý.\n"
+"Ýmza dosyasýnýn (.sig veya .asc) komut satýrýnda verilecek\n"
+"ilk dosya olmasý gerektiðini lutfen hatýrýnýzdan çýkarmayýn.\n"
+
+#: g10/verify.c:173
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr "girdi satýrý %u ya çok uzun ya da sonunda LF yok\n"
+
+#: g10/ringedit.c:302
+#, c-format
+msgid "%s: can't create keyring: %s\n"
+msgstr "%s: anahtar demeti yaratýlamadý: %s\n"
+
+#: g10/ringedit.c:319 g10/ringedit.c:1376
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: anahtar demeti yaratýldý\n"
+
+#: g10/ringedit.c:1557
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "UYARI: gizli bilgilerle 2 dosya mevcut.\n"
+
+#: g10/ringedit.c:1558
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s deðiþmeyen\n"
+
+#: g10/ringedit.c:1559
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s yeni\n"
+
+#: g10/ringedit.c:1560
+msgid "Please fix this possible security flaw\n"
+msgstr "Lutfen bu güvenlik çatlaðýný giderin\n"
+
+#: g10/skclist.c:110 g10/skclist.c:166
+msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+msgstr ""
+"anahtar güvenli olarak iþaretlenmemiþ - onu sahte RNG ile kullanmayýn!\n"
+
+#: g10/skclist.c:138
+#, fuzzy, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "\"%s\" atlandý: %s\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
+#, c-format
+msgid "skipped `%s': %s\n"
+msgstr "\"%s\" atlandý: %s\n"
+
+#: g10/skclist.c:149
+#, fuzzy
+msgid "skipped: secret key already present\n"
+msgstr "%s: atlandý: genel anahtar zaten mevcut\n"
+
+#: g10/skclist.c:160
+#, c-format
+msgid ""
+"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"signatures!\n"
+msgstr ""
+"\"%s\" atlandý: bu imzalar için güvenli olmayan PGP üretimi bir ElGamal "
+"anahtarý!\n"
+
+#. do not overwrite
+#: g10/openfile.c:84
+#, c-format
+msgid "File `%s' exists. "
+msgstr "\"%s\" dosyasý var. "
+
+#: g10/openfile.c:86
+msgid "Overwrite (y/N)? "
+msgstr "Üzerine yazýlsýn mý? (e/H)? "
+
+#: g10/openfile.c:119
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr "%s: bilinmeyen sonek\n"
+
+#: g10/openfile.c:141
+msgid "Enter new filename"
+msgstr "Yeni dosya ismini girin"
+
+#: g10/openfile.c:184
+msgid "writing to stdout\n"
+msgstr "standard çýktýya yazýyor\n"
+
+#: g10/openfile.c:273
+#, c-format
+msgid "assuming signed data in `%s'\n"
+msgstr "\"%s\" içindeki veri imzalý sanýlýyor\n"
+
+#: g10/openfile.c:323
+#, c-format
+msgid "%s: new options file created\n"
+msgstr "%s: yeni seçenekler dosyasý yaratýldý\n"
+
+#: g10/openfile.c:350
+#, c-format
+msgid "%s: can't create directory: %s\n"
+msgstr "%s: dizin yaratýlamadý: %s\n"
+
+#: g10/openfile.c:353
+#, c-format
+msgid "%s: directory created\n"
+msgstr "%s: dizin yaratýldý\n"
+
+#: g10/openfile.c:355
+msgid "you have to start GnuPG again, so it can read the new options file\n"
+msgstr ""
+"Yeni seçenekler dosyasýnýn okunabilmesi için GnuPG yeniden baþlatýlmalýdýr\n"
+
+#: g10/encr-data.c:66
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s þifreli veri\n"
+
+#: g10/encr-data.c:68
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "bilinmeyen algoritma %d ile þifrelenmiþ\n"
+
+#: g10/encr-data.c:90
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgstr "UYARI: ileti simetrik þifre içindeki zayýf bir anahtarla þifrelendi.\n"
+
+#: g10/encr-data.c:97
+#, fuzzy
+msgid "problem handling encrypted packet\n"
+msgstr "þifreli paketlerin anahtar-kimlik alanlarýný kurar"
+
+#: g10/seskey.c:52
+msgid "weak key created - retrying\n"
+msgstr "zayýf anahtar yaratýldý - yeniden deneniyor\n"
+
+#: g10/seskey.c:57
+#, c-format
+msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
+msgstr ""
+"simetrik þifre için zayýf anahtarýn önlenmesi mümkün olamadý: %d kere "
+"denendi!\n"
+
+#: g10/delkey.c:114
+msgid "can't do that in batchmode without \"--yes\"\n"
+msgstr "önceden belirlenmiþ iþlemler kipinde \"--yes\" olmaksýzýn yapýlamaz\n"
+
+#: g10/delkey.c:136
+msgid "Delete this key from the keyring? "
+msgstr "Bu anahtar, anahtar demetinden silinsin mi? "
+
+#: g10/delkey.c:144
+msgid "This is a secret key! - really delete? "
+msgstr "Bu bir gizli anahtar! - gerçekten silinecek mi? "
+
+#: g10/delkey.c:181
+msgid "there is a secret key for this public key!\n"
+msgstr "Bu genel anahtar için bir gizli anahtar var!\n"
+
+#: g10/delkey.c:183
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr "silmek için \"--delete-secret-key\" seçeneðini önce kullanýn.\n"
+
+#: g10/helptext.c:47
+msgid ""
+"It's up to you to assign a value here; this value will never be exported\n"
+"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
+"to do with the (implicitly created) web-of-certificates."
+msgstr ""
+"Bir deðeri buraya iþaretlemek size kalmýþ; bu deðer herhangi bir 3. partiye\n"
+"gönderilmiþ olmayacak. Bizim bir güvence webi saðlamaya ihtiyacýmýz var;\n"
+"(açýkça belirtilmeden yaratýlmýþ) bir sertifikalar web'iyle hiçbir þey\n"
+"yapýlmaz."
+
+#: g10/helptext.c:53
+msgid "If you want to use this revoked key anyway, answer \"yes\"."
+msgstr ""
+"Bu yürürlükten kaldýrýlmýþ anahtarý yine de kullanmak istiyorsanýz, cevap "
+"olarak \"evet\" yazýn."
+
+#: g10/helptext.c:57
+msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+msgstr ""
+"Bu güvencesiz anahtarý yine de kullanmak istiyorsanýz, cevap olarak \"evet\" "
+"yazýn."
+
+#: g10/helptext.c:61
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
+msgstr "Bu iletiyi göndereceðiniz adresin özgün dizisini girin"
+
+#: g10/helptext.c:65
+#, fuzzy
+msgid ""
+"Select the algorithm to use.\n"
+"\n"
+"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+"for signatures.  This is the suggested algorithm because verification of\n"
+"DSA signatures are much faster than those of ElGamal.\n"
+"\n"
+"ElGamal is an algorithm which can be used for signatures and encryption.\n"
+"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+"only\n"
+"and a sign+encrypt; actually it is the same, but some parameters must be\n"
+"selected in a special way to create a safe key for signatures: this program\n"
+"does this but other OpenPGP implementations are not required to understand\n"
+"the signature+encryption flavor.\n"
+"\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."
+msgstr ""
+"DSA (aka DSS) yalnýz imzalar için kullanýlabilen bir sayýsal imza\n"
+"algoritmasýdýr. Bu algoritma DSA imzalarýnýn doðrulanmasý "
+"ElGamal'ýnkilerden\n"
+"daha hýzlý olduðundan tavsiye edilen bir algoritmadýr.\n"
+"\n"
+"ElGamal imzalar ve þifreleme için kullanýlabilen bir algoritmadýr. OpenPGP\n"
+"bu algoritmanýn iki kullanýmýný birbirinden ayýrdeder:\n"
+"bir yalnýz þifreleme için\n"
+"ve bir imza+þifreleme için\n"
+"aslýnda ikisi de aynýdýr ama imzalar için bir güvenli bir anahtar yaratmak\n"
+"için bazý parametreleri özel bir yöntemle seçilmiþ olmalýdýr: bu program\n"
+"bunu yapar fakat diðer OpenPGP taklitlerinin imza+þifreleme ayrýmýný\n"
+"anlamasý gerekli deðildir.\n"
+"Ýlk (öncelikli) anahtar daima imzalama yapabilen bir anahtar olmalýdýr; Bu\n"
+"sadece þifreleme yapabilen ElGamal anahtarýnýn neden menude bulunmadýðýný\n"
+"açýklar."
+
+#: g10/helptext.c:85
+msgid ""
+"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."
+msgstr ""
+"Bu anahtarlar tüm programlar tarafýndan desteklenmediði için ve\n"
+"onlarla yaratýlan imzalar gereðinden büyük ve doðrulanmasý çok yavaþ\n"
+"olduðundan RFC2440 standardýnda tanýmlý olmalarýna raðmen tavsiye\n"
+"edilmezler."
+
+#: g10/helptext.c:92
+msgid "Enter the size of the key"
+msgstr "Anahtar uzunluðunu girin"
+
+#: g10/helptext.c:96 g10/helptext.c:101 g10/helptext.c:113 g10/helptext.c:145
+#: g10/helptext.c:150 g10/helptext.c:155 g10/helptext.c:160
+msgid "Answer \"yes\" or \"no\""
+msgstr "Cevap \"evet\" ya da \"hayýr\""
+
+#: g10/helptext.c:106
+msgid ""
+"Enter the required value as shown in the prompt.\n"
+"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+"get a good error response - instead the system tries to interpret\n"
+"the given value as an interval."
+msgstr ""
+"Ýstenen deðeri girin. Ýyi bir hata cevabý almak istemezseniz onu\n"
+"ISO tarih biçiminde (YYYY-AA-GG) girmeniz mümkündür - ya da verilen\n"
+"deðeri sistem bir zaman aralýðý olarak çözmeyi dener."
+
+#: g10/helptext.c:118
+msgid "Enter the name of the key holder"
+msgstr "Anahtar tutucunun ismini girin"
+
+#: g10/helptext.c:123
+msgid "please enter an optional but highly suggested email address"
+msgstr ""
+"lütfen bir Eposta adresi girin (isteðe baðlý ancak þiddetle tavsiye edilir)"
+
+#: g10/helptext.c:127
+msgid "Please enter an optional comment"
+msgstr "Lütfen bir yorum girin (isteðe baðlý)"
+
+#: g10/helptext.c:132
+msgid ""
+"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."
+msgstr ""
+"Ý Ýsim deðiþtirmek için.\n"
+"Y Yorumu deðiþtirmek için.\n"
+"E Eposta adresini deðiþtirmek için.\n"
+"D anahtar üretimine Devam etmek için.\n"
+"Ç anahtar üretiminden Çýkmak için."
+
+#: g10/helptext.c:141
+msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+msgstr "Yardýmcý anahtarý üretmek istiyorsanýz \"evet\" ya da \"e\" girin."
+
+#: g10/helptext.c:164
+msgid "Answer \"yes\" is you want to sign ALL the user IDs"
+msgstr "Özgün dizilerin TÜMünü imzalamak istiyorsanýz \"evet\" girin"
+
+#: g10/helptext.c:168
+msgid ""
+"Answer \"yes\" if you really want to delete this user ID.\n"
+"All certificates are then also lost!"
+msgstr ""
+"Bu özgün diziyi gerçekten silmek istiyorsanýz \"evet\" girin.\n"
+"Böylece bütün sertifikalarýnýzý kaybedeceksiniz!"
+
+#: g10/helptext.c:173
+msgid "Answer \"yes\" if it is okay to delete the subkey"
+msgstr "Bu yardýmcý anahtarý silmek istiyorsanýz \"evet\" girin"
+
+#: g10/helptext.c:178
+msgid ""
+"This is a valid signature on the key; you normally don't want\n"
+"to delete this signature because it may be important to establish a\n"
+"trust connection to the key or another key certified by this key."
+msgstr ""
+"Bu, anahtar üzerinde geçerli bir imzadýr; anahtara ya da bu anahtarla\n"
+"sertifikalanmýþ bir diðer anahtara bir güvence baðlantýsý saðlamakta\n"
+"önemli olabileceðinden normalde bu imzayý silmek istemezsiniz."
+
+#: g10/helptext.c:183
+msgid ""
+"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."
+msgstr ""
+"Karþýlýðý olmasý gereken anahtara sahip olmadýðýnýzdan bu imza kontrol\n"
+"edilemez. Bu imzalama anahtarý bir diðer zaten sertifikalý anahtara bir\n"
+"güvence baðlantýsý saðlamasý gerektiðinden kullanýlmýþ olduðunu bilene\n"
+"kadar silinmesini erteleyeceksiniz."
+
+#: g10/helptext.c:189
+msgid ""
+"The signature is not valid.  It does make sense to remove it from\n"
+"your keyring."
+msgstr ""
+"Ýmza geçersiz. Onu anahtar demetinden kaldýrmak için baþka nedene ihtiyaç "
+"yok."
+
+#: g10/helptext.c:193
+msgid ""
+"This is a signature which binds the user ID to the key. It is\n"
+"usually not a good idea to remove such a signature.  Actually\n"
+"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."
+msgstr ""
+"Bu imza özgün diziyi anahtara baðlar. Öz-imzayý silmek hiç iyi\n"
+"bir fikir deðil. GnuPG bu anahtarý bir daha hiç kullanamayabilir.\n"
+"Bunu sadece, eðer bu öz-imza bazý durumlarda geçerli deðilse ya da\n"
+"bir ikincisi yerine kullanýlabilecekse yapýn."
+
+#: g10/helptext.c:202
+msgid ""
+"Please enter the passhrase; this is a secret sentence \n"
+"  Blurb, blurb,.... "
+msgstr ""
+"Lutfen anahtar parolanýzý girin; bu gizli bir cümle \n"
+"  Blurb, blurb,.... "
+
+#: g10/helptext.c:209
+msgid "Please repeat the last passphrase, so you are sure what you typed in."
+msgstr "Lütfen son parolayý tekrarla ki ne yazdýðýný bildiðinden emin ol."
+
+#: g10/helptext.c:213
+msgid "Give the name of the file to which the signature applies"
+msgstr "Ýmzanýn uygulanacaðý dosyanýn ismini verin"
+
+#: g10/helptext.c:218
+msgid "Answer \"yes\" if it is okay to overwrite the file"
+msgstr "Dosyanýn üzerine yazýlacaksa lütfen \"evet\" yazýn"
+
+#: g10/helptext.c:223
+msgid ""
+"Please enter a new filename. If you just hit RETURN the default\n"
+"file (which is shown in brackets) will be used."
+msgstr ""
+"Lütfen yeni dosya ismini girin. Dosya ismini yazmadan RETURN tuþlarsanýz\n"
+"parantez içinde gösterilen öntanýmlý dosya kullanýlacak."
+
+#: g10/helptext.c:229
+msgid ""
+"You should specify a reason for the certification.  Depending on the\n"
+"context you have the ability to choose from this list:\n"
+"  \"Key has been compromised\"\n"
+"      Use this if you have a reason to believe that unauthorized persons\n"
+"      got access to your secret key.\n"
+"  \"Key is superseded\"\n"
+"      Use this if you have replaced this key with a newer one.\n"
+"  \"Key is no longer used\"\n"
+"      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"
+msgstr ""
+"Sertifikalama için bir sebep belirtmelisiniz. Ýçeriðine baðlý olarak\n"
+"bu listeden seçme yeterliðine sahipsiniz:\n"
+"  \"Anahtar tehlikede\"\n"
+"\tYetkisiz kiþilerin gizli anahtarýnýza eriþebildiðine inanýyorsanýz\n"
+"\tbunu seçin.\n"
+"  \"Anahtar geçici\"\n"
+"\tDaha yeni biriyle bu anahtarý deðiþtirecekseniz bunu seçin.\n"
+"  \"Anahtar artýk kullanýlmayacak\"\n"
+"\tAnahtarý emekliye ayýracaksanýz bunu seçin.\n"
+"  \"Özgün dizi artýk geçersiz\"\n"
+"\tÖzgün dizi artýk kullanýlmayacak durumdaysa bunu seçin; normalde\n"
+"\tEposta adresi geçersiz olduðunda kullanýlýr.\n"
+
+#: g10/helptext.c:245
+msgid ""
+"If you like, you can enter a text describing why you issue this\n"
+"revocation certificate.  Please keep this text concise.\n"
+"An empty line ends the text.\n"
+msgstr ""
+"Ýsterseniz, neden bu yürürlükten kaldýrma sertifikasýný\n"
+"yayýnlayacaðýnýzý açýklayan bir metin girebilirsiniz.\n"
+"Lütfen bu metin kýsa olsun. Bir boþ satýr metni bitirir.\n"
+
+#: g10/helptext.c:260
+msgid "No help available"
+msgstr "yardým taze bitti"
+
+#: g10/helptext.c:268
+#, c-format
+msgid "No help available for `%s'"
+msgstr "\"%s\" için yardým taze bitti"
+
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "Bu sürümde RSA anahtarý kullanýlamaz\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Özgün dizi için anahtar yok\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Anahtar için özgün dizi yok\n"
+
+#~ msgid "invalid"
+#~ msgstr "geçersiz"
+
+#~ msgid "revoked"
+#~ msgstr "yürürlükten kaldýrýldý"
+
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "þifre çözme için kullanýþlý bir gizli anahtar yok\n"
diff -urN gnupg-1.0.4/scripts/ChangeLog gnupg-1.0.5/scripts/ChangeLog
--- gnupg-1.0.4/scripts/ChangeLog	Thu Sep 14 17:45:13 2000
+++ gnupg-1.0.5/scripts/ChangeLog	Thu Apr 19 13:15:16 2001
@@ -1,3 +1,21 @@
+2001-04-19  Werner Koch  <wk@gnupg.org>
+
+	* autogen.sh: Add VPATH build support for option --build-w32. 
+
+2001-03-12  Werner Koch  <wk@gnupg.org>
+
+	* config.guess, config.sub: Replaced with the current GNU CVS ones. 
+
+2001-01-18  Werner Koch  <wk@gnupg.org>
+
+	* autogen.sh: New options --build-w32
+	* build-w32: Does now call autogen.sh
+
+2000-11-24  Werner Koch  <wk@gnupg.org>
+
+	* build-w32: New script to build the W32 version.
+	* distfiles: And put it into the distribution
+
 Thu Sep 14 17:45:11 CEST 2000  Werner Koch  <wk@openit.de>
 
         * gnupg.spec.in: Updated.
@@ -121,4 +139,16 @@
 
 	* config.guess (FreeBSD): Changes from Jun Kuriyama to support ELF
 	* config.sub: (freebsd): Add to maybe_os
+
+
+ Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
 
diff -urN gnupg-1.0.4/scripts/autogen.sh gnupg-1.0.5/scripts/autogen.sh
--- gnupg-1.0.4/scripts/autogen.sh	Sat Oct  9 20:37:00 1999
+++ gnupg-1.0.5/scripts/autogen.sh	Sat Apr 28 19:53:02 2001
@@ -1,12 +1,75 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
+#
+# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 PGM=GnuPG
-DIE=no
-
+lib_config_files=""
 autoconf_vers=2.13
 automake_vers=1.4
 aclocal_vers=1.4
+
+
+DIE=no
+if test "$1" = "--build-w32"; then
+    tsdir=$(cd `dirname $0`; cd ..; pwd)
+    shift
+    target=i386--mingw32
+    if [ ! -f $tsdir/scripts/config.guess ]; then
+        echo "$tsdir/scripts/config.guess not found" >&2
+        exit 1
+    fi
+    host=`$tsdir/scripts/config.guess`
+        
+    if ! mingw32 --version >/dev/null; then
+        echo "We need at least version 0.3 of MingW32/CPD" >&2
+        exit 1
+    fi
+
+    if [ -f "$tsdir/config.h" ]; then
+        if grep HAVE_DOSISH_SYSTEM config.h | grep undef >/dev/null; then
+            echo "Pease run a 'make distclean' first" >&2
+            exit 1
+        fi
+    fi
+
+    crossbindir=`mingw32 --install-dir`/bin
+    CC=`mingw32 --get-path gcc`
+    CPP=`mingw32 --get-path cpp`
+    AR=`mingw32 --get-path ar`
+    RANLIB=`mingw32 --get-path ranlib`
+    export CC CPP AR RANLIB 
+
+    disable_foo_tests=""
+    if [ -n "$lib_config_files" ]; then
+        for i in $lib_config_files; do
+            j=`echo $i | tr '[a-z-]' '[A-Z_]'`
+            eval "$j=${crossbindir}/$i"
+            export $j
+            disable_foo_tests="$disable_foo_tests --disable-`echo $i| \
+                           sed 's,-config$,,'`-test"
+            if [ ! -f "${crossbindir}/$i" ]; then                   
+                echo "$i not installed for MingW32" >&2
+                DIE=yes
+            fi
+        done
+    fi
+    [ $DIE = yes ] && exit 1
+
+    $tsdir/configure --host=${host} --target=${target} \
+                ${disable_foo_tests} $*
+    exit $?
+fi
+
+
 
 if (autoconf --version) < /dev/null > /dev/null 2>&1 ; then
     if (autoconf --version | awk 'NR==1 { if( $3 >= '$autoconf_vers') \
diff -urN gnupg-1.0.4/scripts/build-w32 gnupg-1.0.5/scripts/build-w32
--- gnupg-1.0.4/scripts/build-w32	Thu Jan  1 01:00:00 1970
+++ gnupg-1.0.5/scripts/build-w32	Thu Jan 18 09:12:04 2001
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+exec scripts/autogen.sh --build-w32
+
+
+
diff -urN gnupg-1.0.4/scripts/config.guess gnupg-1.0.5/scripts/config.guess
--- gnupg-1.0.4/scripts/config.guess	Wed Sep  6 16:05:52 2000
+++ gnupg-1.0.5/scripts/config.guess	Mon Mar 12 19:53:27 2001
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
-version='2000-07-27'
+timestamp='2001-03-06'
 
 # 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
@@ -32,30 +32,41 @@
 # exits with 0.  Otherwise, it exits with 1.
 #
 # The plan is that this can be called by configure scripts if you
-# don't specify an explicit system type (host/target name).
-#
-# Only a few systems have been added to this list; please add others
-# (but try to keep the structure clean).
-#
+# don't specify an explicit build system type.
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
 Usage: $0 [OPTION]
 
-Output the configuration name of this system.
+Output the configuration name of the system \`$me' is run on.
 
 Operation modes:
-  -h, --help               print this help, then exit
-  -V, --version            print version number, then exit"
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 
 help="
 Try \`$me --help' for more information."
 
 # Parse command line
 while test $# -gt 0 ; do
-  case "$1" in
-    --version | --vers* | -V )
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit 0 ;;
+    --version | -v )
        echo "$version" ; exit 0 ;;
     --help | --h* | -h )
        echo "$usage"; exit 0 ;;
@@ -64,9 +75,7 @@
     - )	# Use stdin as input.
        break ;;
     -* )
-       exec >&2
-       echo "$me: invalid option $1"
-       echo "$help"
+       echo "$me: invalid option $1$help" >&2
        exit 1 ;;
     * )
        break ;;
@@ -78,19 +87,30 @@
   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
-    CC_FOR_BUILD="$HOST_CC"
-  else
-    if test x"$CC" != x; then
-      CC_FOR_BUILD="$CC"
-    else
-      CC_FOR_BUILD=cc
-    fi
-  fi
-fi
 
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script.
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int dummy(){}" > $dummy.c
+	for c in cc gcc c89 ; do
+	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
+	  if test $? = 0 ; then
+	     CC_FOR_BUILD="$c"; break
+	  fi
+	done
+	rm -f $dummy.c $dummy.o $dummy.rel
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 8/24/94.)
@@ -100,12 +120,9 @@
 
 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
 UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
-
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -129,16 +146,24 @@
 	    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 Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE}" in
+	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
+		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
+		;;
+	    *)
+	        os=netbsd
+		;;
+	esac
 	# The OS release
 	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
@@ -247,7 +272,7 @@
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
-    SR2?01:HI-UX/MPP:*:*)
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
 	exit 0;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
@@ -383,7 +408,7 @@
 EOF
 	$CC_FOR_BUILD $dummy.c -o $dummy \
 	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm $dummy.c $dummy && exit 0
+	  && rm -f $dummy.c $dummy && exit 0
 	rm -f $dummy.c $dummy
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
@@ -437,6 +462,14 @@
     i?86:AIX:*:*)
 	echo i386-ibm-aix
 	exit 0 ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit 0 ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 		sed 's/^		//' << EOF >$dummy.c
@@ -450,7 +483,7 @@
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
 		rm -f $dummy.c $dummy
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
@@ -459,9 +492,9 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit 0 ;;
-    *:AIX:*:4)
+    *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
 		IBM_ARCH=powerpc
@@ -469,7 +502,7 @@
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
 	else
-		IBM_REV=4.${UNAME_RELEASE}
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
 	exit 0 ;;
@@ -495,10 +528,28 @@
 	echo m68k-hp-bsd4.4
 	exit 0 ;;
     9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
 	    9000/[678][0-9][0-9])
+              case "${HPUX_REV}" in
+                11.[0-9][0-9])
+                  if [ -x /usr/bin/getconf ]; then
+                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    case "${sc_cpu_version}" in
+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                      532)                      # CPU_PA_RISC2_0
+                        case "${sc_kernel_bits}" in
+                          32) HP_ARCH="hppa2.0n" ;;
+                          64) HP_ARCH="hppa2.0w" ;;
+                        esac ;;
+                    esac
+                  fi ;;
+              esac
+              if [ "${HP_ARCH}" = "" ]; then
               sed 's/^              //' << EOF >$dummy.c
 
               #define _HPUX_SOURCE
@@ -533,11 +584,16 @@
               }
 EOF
 	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+	if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
 	rm -f $dummy.c $dummy
+	fi ;;
 	esac
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit 0 ;;
     3050*:HI-UX:*:*)
 	sed 's/^	//' << EOF >$dummy.c
 	#include <unistd.h>
@@ -564,7 +620,7 @@
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
 	rm -f $dummy.c $dummy
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
@@ -628,23 +684,24 @@
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
-    CRAY*T3E:*:*:*)
+    CRAY*T3D:*:*:*)
 	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-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 ;;
-    F300:UNIX_System_V:*:*)
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
-    F301:UNIX_System_V:*:*)
-       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
-       exit 0 ;;
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -669,6 +726,9 @@
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit 0 ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -690,57 +750,38 @@
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
-    *:Linux:*:*)
-
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	ld_help_string=`cd /; ld --help 2>&1`
-	ld_supported_emulations=`echo $ld_help_string \
-			 | sed -ne '/supported emulations:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported emulations: *//
-				    s/ .*//
-				    p'`
-        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
+    arm*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux
+	exit 0 ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnuaout
+	exit 0 ;;
+    mips:Linux:*:*)
+	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[]; {
+#endif
+#ifdef __MIPSEB__
+  printf ("%s-unknown-linux-gnu\n", argv[1]);
+#endif
+#ifdef __MIPSEL__
+  printf ("%sel-unknown-linux-gnu\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
+	;;
+    ppc:Linux:*:*)
+	# Determine Lib Version
+	cat >$dummy.c <<EOF
 #include <features.h>
 #if defined(__GLIBC__)
 extern char __libc_version[];
@@ -753,127 +794,127 @@
 #if defined(__GLIBC__)
   printf("%s %s\n", __libc_version, __libc_release);
 #else
-  printf("unkown\n");
+  printf("unknown\n");
 #endif
   return 0;
 }
 EOF
-		LIBC=""
-		$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
+	LIBC=""
+	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
+	if test "$?" = 0 ; then
+		./$dummy | grep 1\.99 > /dev/null
+		if test "$?" = 0 ; then LIBC="libc1" ; fi
+	fi
+	rm -f $dummy.c $dummy
+	echo powerpc-unknown-linux-gnu${LIBC}
+	exit 0 ;;
+    alpha:Linux:*:*)
+	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
+		case `./$dummy` in
+		0-0)	UNAME_MACHINE="alpha" ;;
+		1-0)	UNAME_MACHINE="alphaev5" ;;
+		1-1)    UNAME_MACHINE="alphaev56" ;;
+		1-101)	UNAME_MACHINE="alphapca56" ;;
+		2-303)	UNAME_MACHINE="alphaev6" ;;
+		2-307)	UNAME_MACHINE="alphaev67" ;;
+		esac
+		objdump --private-headers $dummy | \
+		  grep ld.so.1 > /dev/null
 		if test "$?" = 0 ; then
-			./$dummy | grep 1\.99 > /dev/null
-			if test "$?" = 0 ; then
-				LIBC="libc1"
-			fi
+			LIBC="libc1"
 		fi
-		rm -f $dummy.c $dummy
-		echo powerpc-unknown-linux-gnu${LIBC}
+	fi
+	rm -f $dummy.s $dummy
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit 0 ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
+	esac
+	exit 0 ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit 0 ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux
+	exit 0 ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    sparc:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    x86_64:Linux:*:*)
+	echo x86_64-unknown-linux-gnu
+	exit 0 ;;
+    i?86:Linux:*:*)
+	# The BFD linker knows what the default object file format is, so
+	# first see if it will tell us. cd to the root directory to prevent
+	# problems with other programs or directories called `ld' in the path.
+	ld_supported_emulations=`cd /; ld --help 2>&1 \
+			 | sed -ne '/supported emulations:/!d
+				    s/[ 	][ 	]*/ /g
+				    s/.*supported emulations: *//
+				    s/ .*//
+				    p'`
+        case "$ld_supported_emulations" in
+	  i?86linux)
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 		exit 0
 		;;
-	  shelf_linux)
-		echo "${UNAME_MACHINE}-unknown-linux-gnu"
+	  elf_i?86)
+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+		;;
+	  i?86coff)
+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
 		exit 0
 		;;
 	esac
-
-	if test "${UNAME_MACHINE}" = "alpha" ; then
-		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
-			case `./$dummy` in
-			0-0)
-				UNAME_MACHINE="alpha"
-				;;
-			1-0)
-				UNAME_MACHINE="alphaev5"
-				;;
-			1-1)
-				UNAME_MACHINE="alphaev56"
-				;;
-			1-101)
-				UNAME_MACHINE="alphapca56"
-				;;
-			2-303)
-				UNAME_MACHINE="alphaev6"
-				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
-			esac
-
-			objdump --private-headers $dummy | \
-			  grep ld.so.1 > /dev/null
-			if test "$?" = 0 ; then
-				LIBC="libc1"
-			fi
-		fi
-		rm -f $dummy.s $dummy
-		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
-	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[]; {
-#endif
-#ifdef __MIPSEB__
-  printf ("%s-unknown-linux-gnu\n", argv[1]);
-#endif
-#ifdef __MIPSEL__
-  printf ("%sel-unknown-linux-gnu\n", argv[1]);
-#endif
-  return 0;
-}
-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.
-	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
-	  # If ld does not provide *any* "supported emulations:"
-	  # that means it is gnuoldld.
-	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
-	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
-
-	  case "${UNAME_MACHINE}" in
-	  i?86)
-	    VENDOR=pc;
-	    ;;
-	  *)
-	    VENDOR=unknown;
-	    ;;
-	  esac
-	  # Determine whether the default compiler is a.out or elf
-	  cat >$dummy.c <<EOF
+	# Either a pre-BFD a.out linker (linux-gnuoldld)
+	# or one that does not give us useful --help.
+	# GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
+	# If ld does not provide *any* "supported emulations:"
+	# that means it is gnuoldld.
+	test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+	case "${UNAME_MACHINE}" in
+	i?86)
+	  VENDOR=pc;
+	  ;;
+	*)
+	  VENDOR=unknown;
+	  ;;
+	esac
+	# Determine whether the default compiler is a.out or elf
+	cat >$dummy.c <<EOF
 #include <features.h>
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -897,10 +938,10 @@
   return 0;
 }
 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 ;;
+	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
+	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+	;;
 # 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.
     i?86:DYNIX/ptx:4*:*)
@@ -977,7 +1018,7 @@
 	exit 0 ;;
     M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1000,9 +1041,12 @@
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
-    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
+    rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
 	exit 0 ;;
@@ -1036,7 +1080,7 @@
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
 	exit 0 ;;
-    news*:NEWS-OS:*:6*)
+    news*:NEWS-OS:6*:*)
 	echo mips-sony-newsos6
 	exit 0 ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
@@ -1079,9 +1123,12 @@
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-W:NONSTOP_KERNEL:*:*)
+    NSR-[KW]:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit 0 ;;
     BS2000:POSIX*:*:*)
 	echo bs2000-siemens-sysv
 	exit 0 ;;
@@ -1099,6 +1146,29 @@
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
 	exit 0 ;;
+    i?86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit 0 ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit 0 ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit 0 ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit 0 ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit 0 ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit 0 ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1190,11 +1260,24 @@
 #endif
 
 #if defined (vax)
-#if !defined (ultrix)
-  printf ("vax-dec-bsd\n"); exit (0);
-#else
-  printf ("vax-dec-ultrix\n"); exit (0);
-#endif
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
 #endif
 
 #if defined (alliant) && defined (i860)
@@ -1205,7 +1288,7 @@
 }
 EOF
 
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
 rm -f $dummy.c $dummy
 
 # Apollos put the system type in the environment.
@@ -1241,8 +1324,9 @@
 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:
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
 
     ftp://ftp.gnu.org/pub/gnu/config/
 
@@ -1251,7 +1335,7 @@
 pertinent to <config-patches@gnu.org> in order to provide the needed
 information to handle your system.
 
-config.guess version = $version
+config.guess timestamp = $timestamp
 
 uname -m = `(uname -m) 2>/dev/null || echo unknown`
 uname -r = `(uname -r) 2>/dev/null || echo unknown`
@@ -1278,7 +1362,7 @@
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "version='"
+# time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
 # End:
diff -urN gnupg-1.0.4/scripts/config.sub gnupg-1.0.5/scripts/config.sub
--- gnupg-1.0.4/scripts/config.sub	Wed Sep  6 15:44:28 2000
+++ gnupg-1.0.5/scripts/config.sub	Mon Mar 12 19:53:30 2001
@@ -1,9 +1,9 @@
 #! /bin/sh
-# Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
-version='2000-07-27'
+timestamp='2001-02-16'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -60,16 +60,30 @@
 Canonicalize a configuration name.
 
 Operation modes:
-  -h, --help               print this help, then exit
-  -V, --version            print version number, then exit"
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 
 help="
 Try \`$me --help' for more information."
 
 # Parse command line
 while test $# -gt 0 ; do
-  case "$1" in
-    --version | --vers* | -V )
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit 0 ;;
+    --version | -v )
        echo "$version" ; exit 0 ;;
     --help | --h* | -h )
        echo "$usage"; exit 0 ;;
@@ -78,9 +92,7 @@
     - )	# Use stdin as input.
        break ;;
     -* )
-       exec >&2
-       echo "$me: invalid option $1"
-       echo "$help"
+       echo "$me: invalid option $1$help"
        exit 1 ;;
 
     *local*)
@@ -105,7 +117,7 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -203,22 +215,24 @@
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
-		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
+	        | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
+		| pyramid | mn10200 | mn10300 | tron | a29k \
 		| 580 | i960 | h8300 \
-		| x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
+		| x86 | ppcbe | mipsbe | mipsle | shbe | shle \
 		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
 		| 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 \
+		| 1750a | dsp16xx | pdp10 | pdp11 \
+		| mips16 | mips64 | mipsel | mips64el \
 		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
 		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
 		| mips64vr5000 | miprs64vr5000el | mcore \
 		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
-		| thumb | d10v | d30v | fr30 | avr)
+		| thumb | d10v | d30v | fr30 | avr | openrisc)
 		basic_machine=$basic_machine-unknown
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
@@ -232,7 +246,7 @@
 	# 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[234567]86)
+	i[234567]86 | x86_64)
 	  basic_machine=$basic_machine-pc
 	  ;;
 	# Object if more than one company name word.
@@ -243,26 +257,28 @@
 	# Recognize the basic CPU types with company name.
 	# FIXME: clean up the formatting here.
 	vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
+	      | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
 	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
 	      | xmp-* | ymp-* \
-	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
+	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
 	      | 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-* \
+	      | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
 	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
 	      | mips64el-* | mips64orion-* | mips64orionel-* \
 	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
 	      | mipstx39-* | mipstx39el-* | mcore-* \
-	      | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
+	      | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
+	      | [cjt]90-* \
 	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
 	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
-	      | bs2000-* | tic54x-* | c54x-*)
+	      | bs2000-* | tic54x-* | c54x-* | x86_64-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -353,8 +369,8 @@
 		basic_machine=cray2-cray
 		os=-unicos
 		;;
-	[ctj]90-cray)
-		basic_machine=c90-cray
+	[cjt]90)
+		basic_machine=${basic_machine}-cray
 		os=-unicos
 		;;
 	crds | unos)
@@ -410,6 +426,10 @@
 		basic_machine=tron-gmicro
 		os=-sysv
 		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
 	h3050r* | hiux*)
 		basic_machine=hppa1.1-hitachi
 		os=-hiuxwe2
@@ -509,14 +529,6 @@
 		basic_machine=i386-unknown
 		os=-vsta
 		;;
-	i386-go32 | go32)
-		basic_machine=i386-unknown
-		os=-go32
-		;;
-	i386-mingw32 | mingw32)
-		basic_machine=i386-unknown
-		os=-mingw32
-		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
 		case $os in
@@ -542,6 +554,10 @@
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -572,7 +588,7 @@
 		os=-coff
 		;;
 	msdos)
-		basic_machine=i386-unknown
+		basic_machine=i386-pc
 		os=-msdos
 		;;
 	mvs)
@@ -636,6 +652,10 @@
 		basic_machine=i960-intel
 		os=-mon960
 		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
 	np1)
 		basic_machine=np1-gould
 		;;
@@ -671,28 +691,28 @@
         pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexen)
+	pentium | p5 | k5 | k6 | nexgen)
 		basic_machine=i586-pc
 		;;
 	pentiumpro | p6 | 6x86 | athlon)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)
-		basic_machine=i786-pc
+		basic_machine=i686-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexen-*)
+	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumii-* | pentium2-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pn)
 		basic_machine=pn-gould
 		;;
-	power)	basic_machine=rs6000-ibm
+	power)	basic_machine=power-ibm
 		;;
 	ppc)	basic_machine=powerpc-unknown
 	        ;;
@@ -707,6 +727,10 @@
 	ps2)
 		basic_machine=i386-ibm
 		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -897,6 +921,10 @@
 	vax)
 		basic_machine=vax-dec
 		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
 	pdp11)
 		basic_machine=pdp11-dec
 		;;
@@ -904,7 +932,7 @@
 		basic_machine=we32k-att
 		;;
 	sh3 | sh4)
-		base_machine=sh-unknown
+		basic_machine=sh-unknown
 		;;
 	sparc | sparcv9)
 		basic_machine=sparc-sun
@@ -987,7 +1015,8 @@
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit*)
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1048,7 +1077,7 @@
 	-ns2 )
 	        os=-nextstep2
 		;;
-	-nsk)
+	-nsk*)
 		os=-nsk
 		;;
 	# Preserve the version number of sinix5.
@@ -1085,7 +1114,7 @@
 	-xenix)
 		os=-xenix
 		;;
-        -*mint | -*MiNT)
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 	        os=-mint
 		;;
 	-none)
@@ -1119,6 +1148,9 @@
 	arm*-semi)
 		os=-aout
 		;;
+	pdp10-*)
+		os=-tops20
+		;;
         pdp11-*)
 		os=-none
 		;;
@@ -1227,7 +1259,7 @@
 	*-masscomp)
 		os=-rtu
 		;;
-	f301-fujitsu)
+	f30[01]-fujitsu | f700-fujitsu)
 		os=-uxpv
 		;;
 	*-rom68k)
@@ -1305,7 +1337,7 @@
 			-mpw* | -macos*)
 				vendor=apple
 				;;
-			-*mint | -*MiNT)
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 				vendor=atari
 				;;
 		esac
@@ -1318,7 +1350,7 @@
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "version='"
+# time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
 # End:
diff -urN gnupg-1.0.4/scripts/distfiles gnupg-1.0.5/scripts/distfiles
--- gnupg-1.0.4/scripts/distfiles	Sat Oct  9 20:37:01 1999
+++ gnupg-1.0.5/scripts/distfiles	Fri Nov 24 12:24:14 2000
@@ -3,6 +3,7 @@
 install-sh
 mkinstalldirs
 mkdiff
+build-w32
 missing
 gnupg.spec.in
 autogen.sh
diff -urN gnupg-1.0.4/scripts/gnupg.spec gnupg-1.0.5/scripts/gnupg.spec
--- gnupg-1.0.4/scripts/gnupg.spec	Tue Oct 17 15:40:57 2000
+++ gnupg-1.0.5/scripts/gnupg.spec	Sun Apr 29 16:39:53 2001
@@ -2,7 +2,7 @@
 # gnupg -- gnu privacy guard
 # This is a template.  The dist target uses it to create the real file.
 #
-%define version 1.0.4
+%define version 1.0.5
 %define name gnupg
 Summary: GNU Utility for data encryption and digital signatures
 Summary(it): Utility GNU per la sicurezza nelle comunicazioni e nell'archiviazione dei dati.
diff -urN gnupg-1.0.4/scripts/mkdiff gnupg-1.0.5/scripts/mkdiff
--- gnupg-1.0.4/scripts/mkdiff	Tue Sep  7 18:48:48 1999
+++ gnupg-1.0.5/scripts/mkdiff	Sat Apr 28 19:54:33 2001
@@ -1,4 +1,13 @@
 #!/bin/sh
+# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 if [ $# != 1 ] ; then
     echo "usage: mkdiff package-name" >&2
diff -urN gnupg-1.0.4/tools/ChangeLog gnupg-1.0.5/tools/ChangeLog
--- gnupg-1.0.4/tools/ChangeLog	Fri Sep 15 18:40:38 2000
+++ gnupg-1.0.5/tools/ChangeLog	Sat Apr 28 19:45:58 2001
@@ -1,3 +1,11 @@
+2001-03-27  Werner Koch  <wk@gnupg.org>
+
+	* mail-signed-keys: Add option --dry-run.
+
+2001-03-21  Werner Koch  <wk@gnupg.org>
+
+	* shmtest.c: Add sys/types.h
+
 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
@@ -9,7 +17,7 @@
 
 Wed Jul  5 13:28:45 CEST 2000  Werner Koch  <wk@>
 
-  * mail-signed-keys: New.
+        * mail-signed-keys: New.
 
 Tue May 23 09:19:00 CEST 2000  Werner Koch  <wk@openit.de>
 
@@ -17,12 +25,10 @@
 
 Thu Jul  8 16:21:27 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
-
 	* lspgpot: New
 
 Wed Jul  7 13:08:40 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
-
 	* Makefile.am: Support for libtool.
 
 Tue Jun  8 13:36:25 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
@@ -41,5 +47,17 @@
 Tue Apr  7 19:50:41 1998  Werner Koch  (wk@isil.d.shuttle.de)
 
 	* bftest.c: Now supports all availabe ciphers.
+
+
+
+ Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 
diff -urN gnupg-1.0.4/tools/Makefile.am gnupg-1.0.5/tools/Makefile.am
--- gnupg-1.0.4/tools/Makefile.am	Wed Jul  5 13:25:36 2000
+++ gnupg-1.0.5/tools/Makefile.am	Thu Mar  8 14:47:40 2001
@@ -1,3 +1,21 @@
+# Copyright (C) 1998, 1999, 2000, 2001 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
+
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST = lspgpot ring-a-party mail-signed-keys
diff -urN gnupg-1.0.4/tools/Makefile.in gnupg-1.0.5/tools/Makefile.in
--- gnupg-1.0.4/tools/Makefile.in	Tue Oct 17 15:40:26 2000
+++ gnupg-1.0.5/tools/Makefile.in	Sun Apr 29 16:39:11 2001
@@ -10,6 +10,24 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+# Copyright (C) 1998, 1999, 2000, 2001 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
+
 
 SHELL = @SHELL@
 
@@ -72,6 +90,7 @@
 DATADIRNAME = @DATADIRNAME@
 DLLTOOL = @DLLTOOL@
 DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
+DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@
 DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@
 DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@
 DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@
diff -urN gnupg-1.0.4/tools/bftest.c gnupg-1.0.5/tools/bftest.c
--- gnupg-1.0.4/tools/bftest.c	Sun Apr 18 10:18:48 1999
+++ gnupg-1.0.5/tools/bftest.c	Sat Apr 28 19:38:17 2001
@@ -1,5 +1,5 @@
 /* bftest.c - Blowfish test program
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/tools/clean-sat.c gnupg-1.0.5/tools/clean-sat.c
--- gnupg-1.0.4/tools/clean-sat.c	Thu Feb 12 15:38:57 1998
+++ gnupg-1.0.5/tools/clean-sat.c	Sat Apr 28 19:46:43 2001
@@ -1,4 +1,13 @@
 /* clean-sat.c
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+ *
+ * This file is free software; as a special exception the author gives
+ * unlimited permission to copy and/or distribute it, with or without
+ * modifications, as long as this notice is preserved.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
 #include <stdio.h>
diff -urN gnupg-1.0.4/tools/lspgpot gnupg-1.0.5/tools/lspgpot
--- gnupg-1.0.4/tools/lspgpot	Wed Jul 14 19:47:21 1999
+++ gnupg-1.0.5/tools/lspgpot	Sat Apr 28 19:47:20 2001
@@ -1,6 +1,14 @@
 #!/bin/sh
 # lspgpot - script to extract the ownertrust values
 # from PGP keyrings and list them in GnuPG ownertrust format.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 ../g10/gpg --dry-run --with-fingerprint --with-colons $* | awk '
 BEGIN { FS=":"
diff -urN gnupg-1.0.4/tools/mail-signed-keys gnupg-1.0.5/tools/mail-signed-keys
--- gnupg-1.0.4/tools/mail-signed-keys	Wed Sep 27 14:24:35 2000
+++ gnupg-1.0.5/tools/mail-signed-keys	Sat Apr 28 19:48:35 2001
@@ -1,7 +1,22 @@
 #!/bin/sh
+# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 # FIXME: Add --dry-run,  use only valid email addreses, extract only given keys
 
+dryrun=0
+if [ "$1" = "--dry-run" ]; then
+   dryrun=1
+   shift
+fi
+
 if [ -z "$1" -o -z "$2" ]; then
    echo "usage: mail-signed-keys keyring signedby" >&2
    exit 1
@@ -13,7 +28,7 @@
 fi
 
 [ -f '.#tdb.tmp' ] && rm '.#tdb.tmp'
-ro="--trustdb-name=./.#tdb.tmp --dry-run --lock-never --no-default-keyring --keyring $1"
+ro="--homedir . --no-options --trustdb-name=./.#tdb.tmp --dry-run --lock-never --no-default-keyring --keyring $1"
 
 signedby=`gpg $ro --fast-list-mode --list-keys --with-colons $2 \
 	  2>/dev/null | awk -F: '$1=="pub" {print $5; exit 0}'`
@@ -23,14 +38,15 @@
     exit 1
 fi
 
-echo "About to send the the keys signed by $signedby" >&2
-echo -n "to their owners.  Do you really want to do this? (y/N)" >&2
-read
-[ "$REPLY" != "y" -a "$REPLY" != "Y" ] && exit 0
-
+if [ "$dryrun" = "0" ]; then
+  echo "About to send the the keys signed by $signedby" >&2
+  echo -n "to their owners.  Do you really want to do this? (y/N)" >&2
+  read
+  [ "$REPLY" != "y" -a "$REPLY" != "Y" ] && exit 0
+fi
 
 gpg $ro --check-sigs --with-colons 2>/dev/null \
-     | awk -F: -v signedby="$signedby" -v gpgopt="$ro" '
+     | awk -F: -v signedby="$signedby" -v gpgopt="$ro" -v dryrun="$dryrun" '
 BEGIN	      { sendmail="/usr/lib/sendmail -oi -t " }
 $1 == "pub"   { nextkid=$5; nextuid=$10
 		if( uidcount > 0 ) { myflush() }
@@ -46,30 +62,34 @@
        print "sending key " substr(kid,9) " to" | "cat >&2"
        for(i=0; i < uidcount; i++ ) {
 	   print "    " uids[i] | "cat >&2"
-	   if( i == 0 ) {
-		printf "To: %s", uids[i]   | sendmail
-	   }
-	   else {
-		printf ",\n    %s", uids[i]   | sendmail
-	   }
+           if( dryrun == 0 ) {
+	      if( i == 0 ) {
+		 printf "To: %s", uids[i]   | sendmail
+	      }
+	      else {
+		 printf ",\n    %s", uids[i]   | sendmail
+	      }
+           }
        }
-       printf "\n"                                        | sendmail
-       print "Subject: I signed your key " substr(kid,9)  | sendmail
-       print ""                                           | sendmail
-       print "Hi,"                                        | sendmail
-       print ""                                           | sendmail
-       print "Here you get back the signed key."          | sendmail
-       print ""                                           | sendmail
-       print "ciao,"                                      | sendmail
-       print "     your Key Signator"                     | sendmail
-       print ""                                           | sendmail
-       cmd = "gpg " gpgopt " --export -a " kid " 2>/dev/null"
-       while( (cmd | getline) > 0 ) {
-	   print | sendmail
+       if(dryrun == 0) {  
+         printf "\n"                                        | sendmail
+         print "Subject: I signed your key " substr(kid,9)  | sendmail
+         print ""                                           | sendmail
+         print "Hi,"                                        | sendmail
+         print ""                                           | sendmail
+         print "Here you get back the signed key."          | sendmail
+         print ""                                           | sendmail
+         print "ciao,"                                      | sendmail
+         print "     your Key Signator"                     | sendmail
+         print ""                                           | sendmail
+         cmd = "gpg " gpgopt " --export -a " kid " 2>/dev/null"
+         while( (cmd | getline) > 0 ) {
+             print | sendmail
+         }
+         print ""                                           | sendmail
+         close(cmd)
+         close( sendmail )
        }
-       print ""                                           | sendmail
-       close(cmd)
-       close( sendmail )
        uidcount=0
 }
 '
diff -urN gnupg-1.0.4/tools/mk-tdata.c gnupg-1.0.5/tools/mk-tdata.c
--- gnupg-1.0.4/tools/mk-tdata.c	Tue Jun  9 18:46:32 1998
+++ gnupg-1.0.5/tools/mk-tdata.c	Sat Apr 28 19:44:23 2001
@@ -1,7 +1,13 @@
-/* mk-tdata.c
+/* mk-tdata.c -  Create some simple random testdata
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
- *  Create some simple random testdata
+ * This file is free software; as a special exception the author gives
+ * unlimited permission to copy and/or distribute it, with or without
+ * modifications, as long as this notice is preserved.
  *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
 #include <config.h>
diff -urN gnupg-1.0.4/tools/mpicalc.c gnupg-1.0.5/tools/mpicalc.c
--- gnupg-1.0.4/tools/mpicalc.c	Tue Jun  8 13:41:46 1999
+++ gnupg-1.0.5/tools/mpicalc.c	Sat Apr 28 19:43:29 2001
@@ -1,5 +1,5 @@
 /* mpitest.c - test the mpi functions
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This is an RPN calculator; values must be given in hex.
  * Operation is like dc(1) except that the input/output radix is
diff -urN gnupg-1.0.4/tools/ring-a-party gnupg-1.0.5/tools/ring-a-party
--- gnupg-1.0.4/tools/ring-a-party	Fri Sep 15 16:28:01 2000
+++ gnupg-1.0.5/tools/ring-a-party	Sat Apr 28 19:48:54 2001
@@ -1,5 +1,14 @@
 #!/bin/sh
 # ring-a-party	- print a keyring suitable for a key signing party
+# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 if [ $# -lt 1 ]; then
     echo "usage: ring-a-party keyring [headerline]" >&2
@@ -54,20 +63,20 @@
 function myflush()
 {
     # fixme: take lines to print here into account
-    if( lines > 50 || lines == -1 ) {
+    if( lines > 45 || lines == -1 ) {
 	if( lines != -1 ) printf "\f";
 	page++;
 	printf "%s  %-50.50s Page %d\n\n", now, KEYRING, page ;
-	printf "Type Bits KeyID      Created    Expires    Algorithm                 Use\n";
+	printf "    Type Bits KeyID      Created    Expires    Algorithm                 Use\n\n";
 	lines = 1;
     }
-    printf "pub  %04d 0x%s %10s %10s %-10s     %15s\n",
+    printf "[ ] pub  %04d 0x%s %10s %10s %-10s     %15s\n",
 	  nbits, keyid, created, expires == ""? "----------":expires, algostr,
 			signencrypt == 1? "Sign & Encrypt":"Sign only";
     length(fpr) == 40 ? printfpr20( fpr ) : printfpr16( fpr );
     lnes += 2;
     for( i=0; i < uidcount; i++ ) {
-	printf "uid  %s\n", uids[i];
+	printf "( ) uid  %s\n", uids[i];
 	lines++;
     }
     printf "\n\n";
@@ -84,7 +93,7 @@
 
 function printfpr16( s )
 {
-    printf "f16    Fingerprint16 =";
+    printf "    f16    Fingerprint16 =";
     for(i=0; i < 16; i++ ) {
 	if( i == 8 ) printf " ";
 	printf " %s", substr( s, i*2+1, 2 );
@@ -94,7 +103,7 @@
 
 function printfpr20( s )
 {
-    printf "f20    Fingerprint20 =";
+    printf "    f20    Fingerprint20 =";
     for(i=0; i < 10; i++ ) {
 	if( i == 5 ) printf " ";
 	printf " %s", substr( s, i*4+1, 4 );
diff -urN gnupg-1.0.4/tools/shmtest.c gnupg-1.0.5/tools/shmtest.c
--- gnupg-1.0.4/tools/shmtest.c	Wed Feb 10 17:22:38 1999
+++ gnupg-1.0.5/tools/shmtest.c	Sat Apr 28 19:45:19 2001
@@ -1,7 +1,16 @@
 /* shmtest.c
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
+ * This file is free software; as a special exception the author gives
+ * unlimited permission to copy and/or distribute it, with or without
+ * modifications, as long as this notice is preserved.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -10,6 +19,7 @@
 #include <signal.h>
 #include <unistd.h>
 #ifdef HAVE_SYS_IPC_H
+  #include <sys/types.h>
   #include <sys/ipc.h>
 #endif
 #ifdef HAVE_SYS_SHM_H
diff -urN gnupg-1.0.4/util/ChangeLog gnupg-1.0.5/util/ChangeLog
--- gnupg-1.0.4/util/ChangeLog	Mon Oct 16 17:47:27 2000
+++ gnupg-1.0.5/util/ChangeLog	Fri Apr 27 15:01:56 2001
@@ -1,3 +1,143 @@
+2001-04-27  Werner Koch  <wk@gnupg.org>
+
+	* memory.c (out_of_core): Print an explanation on reasons why
+	secret memory can get exhausted.
+
+2001-04-23  Werner Koch  <wk@gnupg.org>
+
+	* http.c (http_wait_response): Implement new flag to inhibit the
+	TCP shutdown.
+
+2001-04-20  Werner Koch  <wk@gnupg.org>
+
+	* http.c (http_start_data): Use write_server and not the iobuf
+	stuff.  I wonder why we are at all using write_server - shouldn't
+	it be handled by iobuf?
+
+	* strgutil.c (set_native_charset): Allow utf-8 by introducing the
+	new no_translation variable.
+	(native_to_utf8): Handle no_translation.
+	(utf8_to_native): Ditto.
+
+2001-04-19  Werner Koch  <wk@gnupg.org>
+
+	* miscutil.c (asctimestamp): Handle negative times.  We must do
+	this because Windoze segvs on negative times passed to gmtime().
+	(strtimestamp): Ditto.
+
+2001-04-14  Werner Koch  <wk@gnupg.org>
+
+	* strgutil.c (utf8_to_native): Fixed a segv.  Thanks to Keith Clayton.
+
+2001-04-13  Werner Koch  <wk@gnupg.org>
+
+	* iobuf.c (iobuf_fopen): Removed because it is not used and
+	furthermore mode is ignored for an fname of "-".  Suggested by
+	Florian Weimer.
+
+2001-04-02  Werner Koch  <wk@gnupg.org>
+
+	* iobuf.c (translate_file_handle): New. Use this function
+	everywhere in this file.
+	(iobuf_translate_file_handle): Always use the osfhandle stuff here
+	because callers don't know the implementation details of iobuf and
+	they expect that the handles are translated. 
+
+2001-03-29  Werner Koch  <wk@gnupg.org>
+
+	* miscutil.c (answer_is_yes): An empty string does now return no.
+	(answer_is_yes_no_quit): Likewise.
+
+	* iobuf.c (iobuf_close): Burn the buffers.
+
+2001-03-26  Werner Koch  <wk@gnupg.org>
+
+	* ttyio.c: Define TERMDEVICE depending on OS.
+
+	* http.c (http_start_data): send a CRLF and not just a LF.
+	Pointed out by Steven Murdoch.
+
+2001-03-13  Werner Koch  <wk@gnupg.org>
+
+	* iobuf.c (iobuf_sockopen): New.
+	(sock_filter) [__MINGW32__]: New.
+	(iobuf_ioctl): New.
+	(file_filter): Implemented keep_open mode.
+	* http.c (http_open, http_wait_response): Replaced iobuf_fdopen by
+	iobuf_sockopen and use an iobuf_ioctl to avoid the dup().
+	(deinit_sockets, init_sockets) [__MINGW32__]: New.
+	(connect_server, write_server): Add code to work with W32 sockets.
+
+2001-03-12  Werner Koch  <wk@gnupg.org>
+
+	* strgutil.c (check_trailing_chars,check_trailing_ws): New.
+
+2001-03-08  Werner Koch  <wk@gnupg.org>
+
+	* argparse.c (default_strusage): Changed year of printed copyright
+	to 2001.
+
+	* iobuf.c (fd_cache_invalidate, fd_cache_close, fd_cache_open): New. 
+	(direct_open): Invalidate the fd_cache for read access.
+	(file_filter): Cache the close here.
+	(iobuf_open): Use new my_fopen_ro macro to try the cache first.
+
+2001-03-07  Werner Koch  <wk@gnupg.org>
+
+	* iobuf.c: Made the old stdio file handling cpp conditional
+	controlled by FILE_FILTER_USES_STDIO and added a new
+	open/read/close based one.  We don't need the stdio buffering
+	becuase we are doing our own buffering anyway.  And it is a
+	prerequesite to allow the use of ReadFile et al for W32 which in
+	turn is needed to make the http stuff work there. The new W32
+	stuff has also been implemented. Minor changes to all open functions.
+	(direct_open): New.
+	(file_filter): Core of the new read/write handling.
+	(iobuf_get_filelength): Use W32 API function here. But it is
+	currently limited to 2GB files.
+	(iobuf_seek): Ditto.
+
+2001-03-01  Werner Koch  <wk@gnupg.org>
+
+	* errors.c (g10_errstr): New codes UNU_SECKEY and UNU_PUBKEY.
+
+2000-12-28  Werner Koch  <wk@gnupg.org>
+
+	* dotlock.c: Made all_lockfiles volatile.
+	(remove_lockfiles): Made public.
+
+2000-11-30  Werner Koch  <wk@gnupg.org>
+
+	* iobuf.c (iobuf_translate_file_handle): New.
+	(iobuf_open, iobuf_create): Use it for special filenames
+
+2000-11-11  Paul Eggert  <eggert@twinsun.com>
+
+        * iobuf.c (iobuf_get_filelength): Now returns off_t, not u32.
+        Remove kludges to worry about large files; the callers check
+        for files that are too large, and they should already be doing
+        the right thing in an implementation-independent way.
+        (fopen, fstat): Remove macros.
+
+        * iobuf.c (iobuf_set_limit, iobuf_tell, iobuf_seek): 
+        Use off_t, not ulong, for file offsets.
+        (<limits.h>): Include if needed.
+        (LONG_MAX, LONG_MIN): Define a substitute if needed.
+        (fseeko): Define a substitute if needed.
+
+        * iobuf.c (iobuf_seek):  Do not use %lu to report file
+
+2000-11-09  Werner Koch  <wk@gnupg.org>
+
+	* iobuf.c (iobuf_enable_special_filenames): New.
+	(check_special_filename): New.
+	(iobuf_open): check for special filenames.
+	(iobuf_create): Ditto.
+
+2000-10-23  Werner Koch  <wk@gnupg.org>
+
+	* secmem.c (lock_pool): Don't print warning for Windows.
+
 2000-10-16  Werner Koch  <wk@gnupg.org>
 
 	* secmem.c (lock_pool): Fixed error checking for Linux.
@@ -548,5 +688,17 @@
 Fri Feb 13 15:14:13 1998  Werner Koch  (wk@isil.d.shuttle.de)
 
 	* argparse.c (show_help): New '\v' kludge.
+
+
+
+ Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 
diff -urN gnupg-1.0.4/util/Makefile.am gnupg-1.0.5/util/Makefile.am
--- gnupg-1.0.4/util/Makefile.am	Sat Oct  9 20:37:05 1999
+++ gnupg-1.0.5/util/Makefile.am	Thu Mar  8 14:47:53 2001
@@ -1,3 +1,21 @@
+# Copyright (C) 1998, 1999, 2000, 2001 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
+
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
diff -urN gnupg-1.0.4/util/Makefile.in gnupg-1.0.5/util/Makefile.in
--- gnupg-1.0.4/util/Makefile.in	Tue Oct 17 15:40:11 2000
+++ gnupg-1.0.5/util/Makefile.in	Sun Apr 29 16:38:59 2001
@@ -10,6 +10,24 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+# Copyright (C) 1998, 1999, 2000, 2001 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
+
 
 SHELL = @SHELL@
 
@@ -72,6 +90,7 @@
 DATADIRNAME = @DATADIRNAME@
 DLLTOOL = @DLLTOOL@
 DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
+DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@
 DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@
 DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@
 DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@
diff -urN gnupg-1.0.4/util/argparse.c gnupg-1.0.5/util/argparse.c
--- gnupg-1.0.4/util/argparse.c	Wed Jun 28 17:02:51 2000
+++ gnupg-1.0.5/util/argparse.c	Thu Mar  8 15:25:54 2001
@@ -1,5 +1,6 @@
 /* [argparse.c wk 17.06.97] Argument Parser for option handling
- *	Copyright (C) 1998,1999 Free Software Foundation, Inc.
+ *  Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+ *
  *  This file is part of GnuPG.
  *
  *  GnuPG is free software; you can redistribute it and/or modify
@@ -898,7 +899,7 @@
     switch( level ) {
       case 11: p = "foo"; break;
       case 13: p = "0.0"; break;
-      case 14: p = "Copyright (C) 2000 Free Software Foundation, Inc."; break;
+      case 14: p = "Copyright (C) 2001 Free Software Foundation, Inc."; break;
       case 15: p =
 "This program comes with ABSOLUTELY NO WARRANTY.\n"
 "This is free software, and you are welcome to redistribute it\n"
diff -urN gnupg-1.0.4/util/dotlock.c gnupg-1.0.5/util/dotlock.c
--- gnupg-1.0.4/util/dotlock.c	Thu Apr 13 08:39:53 2000
+++ gnupg-1.0.5/util/dotlock.c	Sun Apr 29 15:25:40 2001
@@ -1,5 +1,5 @@
 /* dotlock.c - dotfile locking
- *	Copyright (C) 1998,2000 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -46,11 +46,10 @@
 };
 
 
-static DOTLOCK all_lockfiles;
+static volatile DOTLOCK all_lockfiles;
 static int never_lock;
 
 static int read_lockfile( const char *name );
-static void remove_lockfiles(void);
 
 void
 disable_dotlock(void)
@@ -349,7 +348,7 @@
 }
 
 
-static void
+void
 remove_lockfiles()
 {
   #ifndef HAVE_DOSISH_SYSTEM
diff -urN gnupg-1.0.4/util/errors.c gnupg-1.0.5/util/errors.c
--- gnupg-1.0.4/util/errors.c	Mon Oct  4 21:27:02 1999
+++ gnupg-1.0.5/util/errors.c	Sat Apr 28 18:19:02 2001
@@ -1,5 +1,5 @@
 /* errors.c  -	error strings
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -101,6 +101,9 @@
       X(SELFTEST_FAILED,"selftest failed")
       X(NOT_ENCRYPTED  ,N_("not encrypted"))
       X(NOT_PROCESSED  ,N_("not processed"))
+      /* the key cannot be used for a specific usage */
+      X(UNU_PUBKEY     ,N_("unusable public key"))
+      X(UNU_SECKEY     ,N_("unusable secret key"))
       default: p = buf; sprintf(buf, "g10err=%d", err); break;
     }
   #undef X
diff -urN gnupg-1.0.4/util/g10u.c gnupg-1.0.5/util/g10u.c
--- gnupg-1.0.4/util/g10u.c	Sat Feb 20 21:45:42 1999
+++ gnupg-1.0.5/util/g10u.c	Sun Apr 29 16:08:29 2001
@@ -27,7 +27,7 @@
 
 /* FIXME: The modules should use functions from libgcrypt */
 
-const char *g10u_revision_string(int dummy) { return "$Revision: 1.5 $"; }
+const char *g10u_revision_string(int dummy) { return "$Revision: 1.5.2.2 $"; }
 
 
 void *g10_malloc( size_t n )	     { return m_alloc( n ); }
diff -urN gnupg-1.0.4/util/http.c gnupg-1.0.5/util/http.c
--- gnupg-1.0.4/util/http.c	Fri Oct  8 20:34:56 1999
+++ gnupg-1.0.5/util/http.c	Sun Apr 29 15:28:03 2001
@@ -1,5 +1,5 @@
 /* http.c  -  HTTP protocol handler
- *	Copyright (C) 1999 Free Software Foundation, Inc.
+ *	Copyright (C) 1999, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -26,16 +26,18 @@
 #include <ctype.h>
 #include <errno.h>
 
-#ifndef HAVE_DOSISH_SYSTEM
-
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <time.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
+#ifdef __MINGW32__
+ #include <windows.h>
+#else
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/time.h>
+ #include <time.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
+#endif
 
 #include "util.h"
 #include "iobuf.h"
@@ -43,6 +45,12 @@
 
 #include "http.h"
 
+#ifdef __MINGW32__
+#define sock_close(a)  closesocket(a)
+#else
+#define sock_close(a)  close(a)
+#endif
+
 #define MAX_LINELEN 20000  /* max. length of a HTTP line */
 #define VALID_URI_CHARS "abcdefghijklmnopqrstuvwxyz"   \
 			"ABCDEFGHIJKLMNOPQRSTUVWXYZ"   \
@@ -67,6 +75,38 @@
 static int connect_server( const char *server, ushort port );
 static int write_server( int sock, const char *data, size_t length );
 
+#ifdef __MINGW32__
+static void
+deinit_sockets (void)
+{
+    WSACleanup();
+}
+
+static void
+init_sockets (void)
+{
+    static int initialized;
+    static WSADATA wsdata;
+
+    if (initialized)
+        return;
+
+    if( WSAStartup( 0x0101, &wsdata ) ) {
+        log_error ("error initializing socket library: ec=%d\n", 
+                    (int)WSAGetLastError () );
+        return;
+    }
+    if( wsdata.wVersion < 0x0001 ) {
+        log_error ("socket library version is %x.%x - but 1.1 needed\n",
+                   LOBYTE(wsdata.wVersion), HIBYTE(wsdata.wVersion));
+        WSACleanup();
+        return;
+    }
+    atexit ( deinit_sockets );
+    initialized = 1;
+}
+#endif /*__MINGW32__*/
+
 
 int
 http_open( HTTP_HD hd, HTTP_REQ_TYPE reqtype, const char *url,
@@ -88,7 +128,7 @@
     if( !rc ) {
 	rc = send_request( hd );
 	if( !rc ) {
-	    hd->fp_write = iobuf_fdopen( hd->sock , "w" );
+	    hd->fp_write = iobuf_sockopen( hd->sock , "w" );
 	    if( hd->fp_write )
 		return 0;
 	    rc = G10ERR_GENERAL;
@@ -96,7 +136,7 @@
     }
 
     if( !hd->fp_read && !hd->fp_write && hd->sock != -1 )
-	close( hd->sock );
+	sock_close( hd->sock );
     iobuf_close( hd->fp_read );
     iobuf_close( hd->fp_write);
     release_parsed_uri( hd->uri );
@@ -110,7 +150,7 @@
 http_start_data( HTTP_HD hd )
 {
     if( !hd->in_data ) {
-	iobuf_put( hd->fp_write, '\n' );
+        write_server (hd->sock, "\r\n", 2);
 	hd->in_data = 1;
     }
 }
@@ -124,15 +164,19 @@
     http_start_data( hd ); /* make sure that we are in the data */
     iobuf_flush( hd->fp_write );
 
-    hd->sock = dup( hd->sock );
+  #if 0
+    hd->sock = dup( hd->sock ); 
     if( hd->sock == -1 )
 	return G10ERR_GENERAL;
-    iobuf_close( hd->fp_write );
+  #endif
+    iobuf_ioctl (hd->fp_write, 1, 1, NULL); /* keep the socket open */
+    iobuf_close (hd->fp_write);
     hd->fp_write = NULL;
-    shutdown( hd->sock, 1 );
+    if ( !(hd->flags & HTTP_FLAG_NO_SHUTDOWN) )
+        shutdown( hd->sock, 1 );
     hd->in_data = 0;
 
-    hd->fp_read = iobuf_fdopen( hd->sock , "r" );
+    hd->fp_read = iobuf_sockopen( hd->sock , "r" );
     if( !hd->fp_read )
 	return G10ERR_GENERAL;
 
@@ -169,7 +213,7 @@
     if( !hd || !hd->initialized )
 	return;
     if( !hd->fp_read && !hd->fp_write && hd->sock != -1 )
-	close( hd->sock );
+	sock_close( hd->sock );
     iobuf_close( hd->fp_read );
     iobuf_close( hd->fp_write );
     release_parsed_uri( hd->uri );
@@ -606,13 +650,13 @@
 
     if( bind( fd, (struct sockaddr *)&mya, sizeof(mya)) ) {
 	log_error("bind to port 11371 failed: %s\n", strerror(errno) );
-	close( fd );
+	sock_close( fd );
 	return -1;
     }
 
     if( listen( fd, 5 ) ) {
 	log_error("listen failed: %s\n", strerror(errno) );
-	close( fd );
+	sock_close( fd );
 	return -1;
     }
 
@@ -645,7 +689,7 @@
 	    fclose(fp);
 	    exit(0);
 	}
-	close( client );
+	sock_close( client );
     }
 
 
@@ -658,9 +702,51 @@
 static int
 connect_server( const char *server, ushort port )
 {
+    int sd;
+#ifdef __MINGW32__
+    struct hostent *hp;
+    struct sockaddr_in ad;
+    unsigned long l;
+    
+    init_sockets ();
+
+    memset (&ad, 0, sizeof(ad));
+    ad.sin_family = AF_INET;
+    ad.sin_port = htons(port);
+
+    if( (l = inet_addr (server)) != SOCKET_ERROR ) {
+        memcpy (&ad.sin_addr, &l, sizeof(l));
+    }
+    else if( (hp = gethostbyname (server)) ) {
+        if( hp->h_addrtype != AF_INET ) {
+            log_error ("%s: unknown address family\n", server);
+            return -1;
+        }
+        if ( hp->h_length != 4 ) {
+            log_error ("%s: illegal address length\n", server);
+            return -1;
+        }
+        memcpy (&ad.sin_addr, hp->h_addr, hp->h_length);
+    }
+    else {
+        log_error ("%s: host not found: ec=%d\n",
+                   server, (int)WSAGetLastError ());
+        return -1;
+    }
+
+    if ((sd = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) {
+        log_error ("error creating socket: ex=%d\n", 
+                   (int)WSAGetLastError ());
+        return -1;
+    }
+
+    if( connect (sd, (struct sockaddr *)&ad, sizeof (ad) ) ) {
+        sock_close (sd);
+        return -1;
+    }
+#else
     struct sockaddr_in addr;
     struct hostent *host;
-    int sd;
 
     addr.sin_family = AF_INET;
     addr.sin_port = htons(port);
@@ -675,10 +761,10 @@
 	return -1;
 
     if( connect( sd, (struct sockaddr *)&addr, sizeof addr) == -1 ) {
-	close(sd);
+	sock_close(sd);
 	return -1;
     }
-
+#endif
     return sd;
 }
 
@@ -686,11 +772,19 @@
 static int
 write_server( int sock, const char *data, size_t length )
 {
-    int nleft, nwritten;
+    int nleft;
 
     nleft = length;
     while( nleft > 0 ) {
-	nwritten = write( sock, data, nleft );
+      #ifdef __MINGW32__  
+        unsigned long nwritten;
+
+        if ( !WriteFile ( sock, data, nleft, &nwritten, NULL)) {
+	    log_info ("write failed: ec=%d\n", (int)GetLastError ());
+	    return G10ERR_NETWORK;
+        }
+      #else
+	int nwritten = write( sock, data, nleft );
 	if( nwritten == -1 ) {
 	    if( errno == EINTR )
 		continue;
@@ -705,14 +799,13 @@
 	    log_info("write failed: %s\n", strerror(errno));
 	    return G10ERR_NETWORK;
 	}
+      #endif
 	nleft -=nwritten;
 	data += nwritten;
     }
 
     return 0;
 }
-
-#endif /* HAVE_DOSISH_SYSTEM */
 
 /**** Test code ****/
 #ifdef TEST
diff -urN gnupg-1.0.4/util/iobuf.c gnupg-1.0.5/util/iobuf.c
--- gnupg-1.0.4/util/iobuf.c	Wed Sep  6 17:16:47 2000
+++ gnupg-1.0.5/util/iobuf.c	Fri Apr 13 20:10:49 2001
@@ -1,5 +1,5 @@
 /* iobuf.c  -  file handling
- *	Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -23,30 +23,82 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#include <ctype.h>
 #include <assert.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <fcntl.h> 
 #include <unistd.h>
 #ifdef HAVE_DOSISH_SYSTEM
-  #include <fcntl.h> /* for setmode() */
+ #include <windows.h>
 #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))
+#undef FILE_FILTER_USES_STDIO
+
+#ifdef HAVE_DOSISH_SYSTEM
+ #define USE_SETMODE 1
 #endif
 
+#ifdef FILE_FILTER_USES_STDIO
+ #define my_fileno(a)  fileno ((a))
+ #define my_fopen_ro(a,b) fopen ((a),(b))
+ #define my_fopen(a,b)    fopen ((a),(b))
+ typedef FILE *FILEP_OR_FD;
+ #define INVALID_FP    NULL
+ #define FILEP_OR_FD_FOR_STDIN  (stdin)
+ #define FILEP_OR_FD_FOR_STDOUT  (stdout)
+ typedef struct {
+     FILE *fp;	   /* open file handle */
+     int keep_open;
+     int  print_only_name; /* flags indicating that fname is not a real file*/
+     char fname[1]; /* name of the file */
+ } file_filter_ctx_t ;
+#else
+ #define my_fileno(a)  (a)
+ #define my_fopen_ro(a,b) fd_cache_open ((a),(b)) 
+ #define my_fopen(a,b) direct_open ((a),(b)) 
+ #ifdef HAVE_DOSISH_SYSTEM
+   typedef HANDLE FILEP_OR_FD;
+   #define INVALID_FP  ((HANDLE)-1)
+   #define FILEP_OR_FD_FOR_STDIN  (GetStdHandle (STD_INPUT_HANDLE))
+   #define FILEP_OR_FD_FOR_STDOUT (GetStdHandle (STD_OUTPUT_HANDLE))
+   #undef USE_SETMODE
+ #else
+   typedef int FILEP_OR_FD;
+   #define INVALID_FP  (-1)
+   #define FILEP_OR_FD_FOR_STDIN  (0)
+   #define FILEP_OR_FD_FOR_STDOUT (1)
+ #endif
+ typedef struct {
+     FILEP_OR_FD  fp;	   /* open file handle */
+     int keep_open;
+     int eof_seen;
+     int  print_only_name; /* flags indicating that fname is not a real file*/
+     char fname[1]; /* name of the file */
+ } file_filter_ctx_t ;
+
+ struct close_cache_s { 
+    struct close_cache_s *next;
+    FILEP_OR_FD fp;
+    char fname[1];
+ };
+ typedef struct close_cache_s *CLOSE_CACHE;
+ static CLOSE_CACHE close_cache;
+#endif
 
+#ifdef __MINGW32__
 typedef struct {
-    FILE *fp;	   /* open file handle */
+    int sock;
+    int keep_open;
+    int eof_seen;
     int  print_only_name; /* flags indicating that fname is not a real file*/
     char fname[1]; /* name of the file */
-} file_filter_ctx_t ;
-
+} sock_filter_ctx_t ;
+#endif /*__MINGW32__*/
 
 /* The first partial length header block must be of size 512
  * to make it easier (and efficienter) we use a min. block size of 512
@@ -65,8 +117,168 @@
     int eof;
 } block_filter_ctx_t;
 
+static int special_names_enabled;
 
 static int underflow(IOBUF a);
+static int translate_file_handle ( int fd, int for_write );
+
+#ifndef FILE_FILTER_USES_STDIO
+
+/*
+ * Invalidate (i.e. close) a cached iobuf
+ */
+static void
+fd_cache_invalidate (const char *fname)
+{
+    CLOSE_CACHE cc;
+
+    assert (fname);
+    if( DBG_IOBUF )
+        log_debug ("fd_cache_invalidate (%s)\n", fname);
+
+    for (cc=close_cache; cc; cc = cc->next ) {
+        if ( cc->fp != INVALID_FP && !strcmp (cc->fname, fname) ) {
+          #ifdef HAVE_DOSISH_SYSTEM
+            CloseHandle (cc->fp);
+          #else
+	    close(cc->fp);
+	  #endif
+            cc->fp = INVALID_FP;
+        }
+    }
+}
+
+
+
+static FILEP_OR_FD
+direct_open (const char *fname, const char *mode)
+{
+#ifdef HAVE_DOSISH_SYSTEM
+    unsigned long da, cd, sm;
+    HANDLE hfile;
+
+    /* Note, that we do not handle all mode combinations */
+
+    /* According to the ReactOS source it seems that open() of the
+     * standard MSW32 crt does open the file in share mode which is
+     * something new for MS applications ;-)
+     */
+    if ( strchr (mode, '+') ) {
+        fd_cache_invalidate (fname);
+        da = GENERIC_READ|GENERIC_WRITE;
+        cd = OPEN_EXISTING;
+        sm = FILE_SHARE_READ | FILE_SHARE_WRITE;
+    }
+    else if ( strchr (mode, 'w') ) {
+        fd_cache_invalidate (fname);
+        da = GENERIC_WRITE;
+        cd = CREATE_ALWAYS;
+        sm = FILE_SHARE_WRITE;
+    }
+    else {
+        da = GENERIC_READ;
+        cd = OPEN_EXISTING;
+        sm = FILE_SHARE_READ;
+    }
+
+    hfile = CreateFile (fname, da, sm, NULL, cd, FILE_ATTRIBUTE_NORMAL, NULL);
+    return hfile;
+#else
+    int oflag;
+    int cflag = S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH;
+
+    /* Note, that we do not handle all mode combinations */
+    if ( strchr (mode, '+') ) {
+        fd_cache_invalidate (fname);
+        oflag = O_RDWR;
+    }
+    else if ( strchr (mode, 'w') ) {
+        fd_cache_invalidate (fname);
+        oflag = O_WRONLY | O_CREAT | O_TRUNC;
+    }
+    else {
+        oflag = O_RDONLY;
+    }
+    return open (fname, oflag, cflag );
+#endif
+}
+
+
+/*
+ * Instead of closing an FD we keep it open and cache it for later reuse 
+ * Note that this caching strategy only works if the process does not chdir.
+ */
+static void
+fd_cache_close (const char *fname, FILEP_OR_FD fp)
+{
+    CLOSE_CACHE cc;
+
+    assert (fp);
+    if ( !fname || !*fname ) {
+#ifdef HAVE_DOSISH_SYSTEM
+        CloseHandle (fp);
+#else
+        close(fp);
+#endif
+        if( DBG_IOBUF )
+            log_debug ("fd_cache_close (%s) immediately\n", fname);
+        return;
+    }
+    /* try to reuse a slot */
+    for (cc=close_cache; cc; cc = cc->next ) {
+        if ( cc->fp == INVALID_FP && !strcmp (cc->fname, fname) ) {
+            cc->fp = fp;
+            return;
+        }
+    }
+    /* add a new one */
+    if( DBG_IOBUF )
+        log_debug ("fd_cache_close (%s) new\n", fname);
+    cc = m_alloc_clear (sizeof *cc + strlen (fname));
+    strcpy (cc->fname, fname);
+    cc->fp = fp;
+    cc->next = close_cache;
+    close_cache = cc;
+}
+
+/*
+ * Do an direct_open on FNAME but first try to reuse one from the fd_cache
+ */
+static FILEP_OR_FD
+fd_cache_open (const char *fname, const char *mode)
+{
+    CLOSE_CACHE cc;
+
+    assert (fname);
+    for (cc=close_cache; cc; cc = cc->next ) {
+        if ( cc->fp != INVALID_FP && !strcmp (cc->fname, fname) ) {
+            FILEP_OR_FD fp = cc->fp;
+            cc->fp = INVALID_FP;
+            if( DBG_IOBUF )
+                log_debug ("fd_cache_open (%s) hit\n", fname);
+          #ifdef HAVE_DOSISH_SYSTEM
+            if (SetFilePointer (fp, 0, NULL, FILE_BEGIN) == 0xffffffff ) {
+                log_error ("rewind file failed on handle %p: ec=%d\n",
+                           fp, (int)GetLastError () );
+                fp = INVALID_FP;
+            }
+          #else
+            if ( lseek (fp, 0, SEEK_SET) == (off_t)-1 ) {
+                log_error("can't rewind fd %d: %s\n", fp, strerror(errno) );
+                fp = INVALID_FP;
+            }
+          #endif
+            return fp;
+        }
+    }
+    if( DBG_IOBUF )
+        log_debug ("fd_cache_open (%s) miss\n", fname);
+    return direct_open (fname, mode);
+}
+
+
+#endif /*FILE_FILTER_USES_STDIO*/
+
 
 /****************
  * Read data from a file into buf which has an allocated length of *LEN.
@@ -96,23 +308,25 @@
 file_filter(void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len)
 {
     file_filter_ctx_t *a = opaque;
-    FILE *fp = a->fp;
+    FILEP_OR_FD f = a->fp;
     size_t size = *ret_len;
     size_t nbytes = 0;
     int rc = 0;
 
+#ifdef FILE_FILTER_USES_STDIO
     if( control == IOBUFCTRL_UNDERFLOW ) {
 	assert( size ); /* need a buffer */
-	if ( feof(fp)) {	/* On terminals you could easiely read as many EOFs as you call 	*/
+	if ( feof(f)) {	/* On terminals you could easiely read as many EOFs as you call 	*/
 	    rc = -1;		/* fread() or fgetc() repeatly. Every call will block until you press	*/
 	    *ret_len = 0;	/* CTRL-D. So we catch this case before we call fread() again.		*/
 	}
 	else {
-	    clearerr( fp );
-	    nbytes = fread( buf, 1, size, fp );
-	    if( feof(fp) && !nbytes )
+	    clearerr( f );
+	    nbytes = fread( buf, 1, size, f );
+	    if( feof(f) && !nbytes ) {
 		rc = -1; /* okay: we can return EOF now. */
-	    else if( ferror(fp) && errno != EPIPE  ) {
+            }
+	    else if( ferror(f) && errno != EPIPE  ) {
 		log_error("%s: read error: %s\n",
 			  a->fname, strerror(errno));
 		rc = G10ERR_READ_FILE;
@@ -122,9 +336,9 @@
     }
     else if( control == IOBUFCTRL_FLUSH ) {
 	if( size ) {
-	    clearerr( fp );
-	    nbytes = fwrite( buf, 1, size, fp );
-	    if( ferror(fp) ) {
+	    clearerr( f );
+	    nbytes = fwrite( buf, 1, size, f );
+	    if( ferror(f) ) {
 		log_error("%s: write error: %s\n", a->fname, strerror(errno));
 		rc = G10ERR_WRITE_FILE;
 	    }
@@ -132,23 +346,218 @@
 	*ret_len = nbytes;
     }
     else if( control == IOBUFCTRL_INIT ) {
+        a->keep_open = 0;
     }
     else if( control == IOBUFCTRL_DESC ) {
 	*(char**)buf = "file_filter";
     }
     else if( control == IOBUFCTRL_FREE ) {
-	if( fp != stdin && fp != stdout ) {
+	if( f != stdin && f != stdout ) {
 	    if( DBG_IOBUF )
-		log_debug("%s: close fd %d\n", a->fname, fileno(fp) );
-	    fclose(fp);
+		log_debug("%s: close fd %d\n", a->fname, fileno(f) );
+            if (!a->keep_open)
+                fclose(f);
 	}
-	fp = NULL;
+	f = NULL;
 	m_free(a); /* we can free our context now */
     }
+#else /* !stdio implementation */
+
+    if( control == IOBUFCTRL_UNDERFLOW ) {
+	assert( size ); /* need a buffer */
+	if ( a->eof_seen) {
+	    rc = -1;		
+	    *ret_len = 0;	
+	}
+	else {
+          #ifdef HAVE_DOSISH_SYSTEM
+            unsigned long nread;
+
+            nbytes = 0;
+            if ( !ReadFile ( f, buf, size, &nread, NULL ) ) {
+                int ec = (int)GetLastError ();
+                if ( ec != ERROR_BROKEN_PIPE ) {
+                    log_error("%s: read error: ec=%d\n", a->fname, ec);
+                    rc = G10ERR_READ_FILE;
+                }
+            }
+            else if ( !nread ) {
+                a->eof_seen = 1;
+                rc = -1;
+            }
+            else {
+                nbytes = nread;
+            }
+
+          #else
 
+            int n;
+
+            nbytes = 0;
+            do {
+                n = read ( f, buf, size );
+            } while (n == -1 && errno == EINTR );
+            if ( n == -1 ) { /* error */
+                if (errno != EPIPE) {
+                    log_error("%s: read error: %s\n",
+                              a->fname, strerror(errno));
+                    rc = G10ERR_READ_FILE;
+                }
+            }
+            else if ( !n ) { /* eof */
+                a->eof_seen = 1;
+                rc = -1;
+            }
+            else {
+                nbytes = n;
+            }
+          #endif
+	    *ret_len = nbytes;
+	}
+    }
+    else if( control == IOBUFCTRL_FLUSH ) {
+	if( size ) {
+          #ifdef HAVE_DOSISH_SYSTEM
+            byte *p = buf;
+            unsigned long n;
+
+            nbytes = size;
+            do {
+                if ( size && !WriteFile ( f,  p, nbytes, &n, NULL) ) {
+                    int ec = (int)GetLastError ();
+                    log_error("%s: write error: ec=%d\n", a->fname, ec);
+                    rc = G10ERR_WRITE_FILE;
+                    break;
+                }
+                p += n;
+                nbytes -= n;
+            } while ( nbytes );
+            nbytes = p - buf;
+          #else
+            byte *p = buf;
+            int n;
+
+            nbytes = size;
+            do {
+                do {
+                    n = write ( f, p, nbytes );
+                } while ( n == -1 && errno == EINTR );
+                if ( n > 0 ) {
+                    p += n;
+                    nbytes -= n;
+                }
+            } while ( n != -1 && nbytes );
+	    if( n == -1 ) {
+		log_error("%s: write error: %s\n", a->fname, strerror(errno));
+		rc = G10ERR_WRITE_FILE;
+	    }
+            nbytes = p - buf;
+          #endif
+	}
+	*ret_len = nbytes;
+    }
+    else if ( control == IOBUFCTRL_INIT ) {
+        a->eof_seen = 0;
+        a->keep_open = 0;
+    }
+    else if ( control == IOBUFCTRL_DESC ) {
+	*(char**)buf = "file_filter(fd)";
+    }
+    else if ( control == IOBUFCTRL_FREE ) {
+      #ifdef HAVE_DOSISH_SYSTEM
+        if ( f != FILEP_OR_FD_FOR_STDIN && f != FILEP_OR_FD_FOR_STDOUT ) {
+	    if( DBG_IOBUF )
+		log_debug("%s: close handle %p\n", a->fname, f );
+            if (!a->keep_open)
+                fd_cache_close (a->fname, f);
+        }
+      #else
+	if ( (int)f != 0 && (int)f != 1 ) {
+	    if( DBG_IOBUF )
+		log_debug("%s: close fd %d\n", a->fname, f );
+            if (!a->keep_open)
+                fd_cache_close (a->fname, f);
+	}
+	f = INVALID_FP;
+      #endif
+	m_free (a); /* we can free our context now */
+    }
+#endif /* !stdio implementation */
     return rc;
 }
 
+#ifdef __MINGW32__
+/* Becuase sockets are an special object under Lose32 we have to
+ * use a special filter */
+static int
+sock_filter (void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len)
+{
+    sock_filter_ctx_t *a = opaque;
+    size_t size = *ret_len;
+    size_t nbytes = 0;
+    int rc = 0;
+
+    if( control == IOBUFCTRL_UNDERFLOW ) {
+	assert( size ); /* need a buffer */
+	if ( a->eof_seen) {
+	    rc = -1;		
+	    *ret_len = 0;	
+	}
+	else {
+            int nread;
+
+            nread = recv ( a->sock, buf, size, 0 );
+            if ( nread == SOCKET_ERROR ) {
+                int ec = (int)WSAGetLastError ();
+                log_error("socket read error: ec=%d\n", ec);
+                rc = G10ERR_READ_FILE;
+            }
+            else if ( !nread ) {
+                a->eof_seen = 1;
+                rc = -1;
+            }
+            else {
+                nbytes = nread;
+            }
+	    *ret_len = nbytes;
+	}
+    }
+    else if( control == IOBUFCTRL_FLUSH ) {
+	if( size ) {
+            byte *p = buf;
+            int n;
+
+            nbytes = size;
+            do {
+                n = send (a->sock, p, nbytes, 0);
+                if ( n == SOCKET_ERROR ) {
+                    int ec = (int)WSAGetLastError ();
+                    log_error("socket write error: ec=%d\n", ec);
+                    rc = G10ERR_WRITE_FILE;
+                    break;
+                }
+                p += n;
+                nbytes -= n;
+            } while ( nbytes );
+            nbytes = p - buf;
+	}
+	*ret_len = nbytes;
+    }
+    else if ( control == IOBUFCTRL_INIT ) {
+        a->eof_seen = 0;
+        a->keep_open = 0;
+    }
+    else if ( control == IOBUFCTRL_DESC ) {
+	*(char**)buf = "sock_filter";
+    }
+    else if ( control == IOBUFCTRL_FREE ) {
+        if (!a->keep_open)
+            closesocket (a->sock);
+	m_free (a); /* we can free our context now */
+    }
+    return rc;
+}
+#endif /*__MINGW32__*/
 
 /****************
  * This is used to implement the block write mode.
@@ -471,9 +880,8 @@
     return a;
 }
 
-
 int
-iobuf_close( IOBUF a )
+iobuf_close ( IOBUF a )
 {
     IOBUF a2;
     size_t dummy_len=0;
@@ -498,7 +906,10 @@
 					 a->chain, NULL, &dummy_len)) )
 	    log_error("IOBUFCTRL_FREE failed on close: %s\n", g10_errstr(rc) );
 	m_free(a->real_fname);
-	m_free(a->d.buf);
+        if (a->d.buf) {
+            memset (a->d.buf, 0, a->d.size); /* erase the buffer */
+            m_free(a->d.buf);
+        }
 	m_free(a);
     }
     return rc;
@@ -573,6 +984,32 @@
     return a;
 }
 
+void
+iobuf_enable_special_filenames ( int yes )
+{
+    special_names_enabled = yes;
+}
+
+/*
+ * see whether the filename has the for "-&nnnn", where n is a
+ * non-zero number.
+ * Returns this number or -1 if it is not the case.
+ */
+static int
+check_special_filename ( const char *fname )
+{
+    if ( special_names_enabled
+         && fname && *fname == '-' && fname[1] == '&' ) {
+        int i;
+
+        fname += 2;
+        for (i=0; isdigit (fname[i]); i++ )
+            ;
+        if ( !fname[i] ) 
+            return atoi (fname);
+    }
+    return -1;
+}
 
 /****************
  * Create a head iobuf for reading from a file
@@ -582,20 +1019,23 @@
 iobuf_open( const char *fname )
 {
     IOBUF a;
-    FILE *fp;
+    FILEP_OR_FD fp;
     file_filter_ctx_t *fcx;
     size_t len;
     int print_only = 0;
+    int fd;
 
     if( !fname || (*fname=='-' && !fname[1])  ) {
-	fp = stdin;
-      #ifdef HAVE_DOSISH_SYSTEM
-	setmode ( fileno(fp) , O_BINARY );
+	fp = FILEP_OR_FD_FOR_STDIN;
+      #ifdef USE_SETMODE
+	setmode ( my_fileno(fp) , O_BINARY );
       #endif
 	fname = "[stdin]";
 	print_only = 1;
     }
-    else if( !(fp = fopen(fname, "rb")) )
+    else if ( (fd = check_special_filename ( fname )) != -1 )
+        return iobuf_fdopen ( translate_file_handle (fd,0), "rb" );
+    else if( (fp = my_fopen_ro(fname, "rb")) == INVALID_FP )
 	return NULL;
     a = iobuf_alloc(1, 8192 );
     fcx = m_alloc( sizeof *fcx + strlen(fname) );
@@ -610,7 +1050,7 @@
     file_filter( fcx, IOBUFCTRL_INIT, NULL, NULL, &len );
     if( DBG_IOBUF )
 	log_debug("iobuf-%d.%d: open `%s' fd=%d\n",
-		   a->no, a->subno, fname, fileno(fcx->fp) );
+		   a->no, a->subno, fname, (int)my_fileno(fcx->fp) );
 
     return a;
 }
@@ -623,12 +1063,16 @@
 iobuf_fdopen( int fd, const char *mode )
 {
     IOBUF a;
-    FILE *fp;
+    FILEP_OR_FD fp;
     file_filter_ctx_t *fcx;
     size_t len;
 
+#ifdef FILE_FILTER_USES_STDIO
     if( !(fp = fdopen(fd, mode)) )
 	return NULL;
+#else
+    fp = (FILEP_OR_FD)fd;
+#endif
     a = iobuf_alloc( strchr( mode, 'w')? 2:1, 8192 );
     fcx = m_alloc( sizeof *fcx + 20 );
     fcx->fp = fp;
@@ -644,6 +1088,32 @@
     return a;
 }
 
+
+IOBUF
+iobuf_sockopen ( int fd, const char *mode )
+{
+#ifdef __MINGW32__
+    IOBUF a;
+    sock_filter_ctx_t *scx;
+    size_t len;
+
+    a = iobuf_alloc( strchr( mode, 'w')? 2:1, 8192 );
+    scx = m_alloc( sizeof *scx + 25 );
+    scx->sock = fd;
+    scx->print_only_name = 1;
+    sprintf(scx->fname, "[sock %d]", fd );
+    a->filter = sock_filter;
+    a->filter_ov = scx;
+    sock_filter( scx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len );
+    sock_filter( scx, IOBUFCTRL_INIT, NULL, NULL, &len );
+    if( DBG_IOBUF )
+	log_debug("iobuf-%d.%d: sockopen `%s'\n", a->no, a->subno, scx->fname);
+    return a;
+#else
+    return iobuf_fdopen (fd, mode);
+#endif
+}
+
 /****************
  * create an iobuf for writing to a file; the file will be created.
  */
@@ -651,20 +1121,23 @@
 iobuf_create( const char *fname )
 {
     IOBUF a;
-    FILE *fp;
+    FILEP_OR_FD fp;
     file_filter_ctx_t *fcx;
     size_t len;
     int print_only = 0;
+    int fd;
 
     if( !fname || (*fname=='-' && !fname[1]) ) {
-	fp = stdout;
-      #ifdef HAVE_DOSISH_SYSTEM
-	setmode ( fileno(fp) , O_BINARY );
+	fp = FILEP_OR_FD_FOR_STDOUT;
+      #ifdef USE_SETMODE
+	setmode ( my_fileno(fp) , O_BINARY );
       #endif
 	fname = "[stdout]";
 	print_only = 1;
     }
-    else if( !(fp = fopen(fname, "wb")) )
+    else if ( (fd = check_special_filename ( fname )) != -1 )
+        return iobuf_fdopen ( translate_file_handle (fd, 1), "wb" );
+    else if( (fp = my_fopen(fname, "wb")) == INVALID_FP )
 	return NULL;
     a = iobuf_alloc(2, 8192 );
     fcx = m_alloc( sizeof *fcx + strlen(fname) );
@@ -686,7 +1159,9 @@
 /****************
  * append to an iobuf; if the file does not exist, create it.
  * cannot be used for stdout.
+ * Note: This is not used.
  */
+#if 0 /* not used */
 IOBUF
 iobuf_append( const char *fname )
 {
@@ -697,7 +1172,7 @@
 
     if( !fname )
 	return NULL;
-    else if( !(fp = fopen(fname, "ab")) )
+    else if( !(fp = my_fopen(fname, "ab")) )
 	return NULL;
     a = iobuf_alloc(2, 8192 );
     fcx = m_alloc( sizeof *fcx + strlen(fname) );
@@ -713,18 +1188,19 @@
 
     return a;
 }
+#endif
 
 IOBUF
 iobuf_openrw( const char *fname )
 {
     IOBUF a;
-    FILE *fp;
+    FILEP_OR_FD fp;
     file_filter_ctx_t *fcx;
     size_t len;
 
     if( !fname )
 	return NULL;
-    else if( !(fp = fopen(fname, "r+b")) )
+    else if( (fp = my_fopen(fname, "r+b")) == INVALID_FP )
 	return NULL;
     a = iobuf_alloc(2, 8192 );
     fcx = m_alloc( sizeof *fcx + strlen(fname) );
@@ -742,41 +1218,37 @@
 }
 
 
-
-/****************
- * You can overwrite the normal iobuf behaviour by using this function.
- * If used the iobuf is a simple wrapper around stdio.
- * NULL if an error occures and sets errno
- */
-IOBUF
-iobuf_fopen( const char *fname, const char *mode )
+int
+iobuf_ioctl ( IOBUF a, int cmd, int intval, void *ptrval )
 {
-    IOBUF a;
-    FILE *fp;
-    int print_only = 0;
-
-    if( !fname || (*fname=='-' && !fname[1])  ) {
-	fp = stdin;
-      #ifdef HAVE_DOSISH_SYSTEM
-	setmode ( fileno(fp) , O_BINARY );
-      #endif
-	fname = "[stdin]";
-	print_only = 1;
+    if ( cmd == 1 ) {  /* keep system filepointer/descriptor open */
+        for( ; a; a = a->chain )
+            if( !a->chain && a->filter == file_filter ) {
+                file_filter_ctx_t *b = a->filter_ov;
+                b->keep_open = intval;
+                return 0;
+            }
+          #ifdef __MINGW32__
+            else if( !a->chain && a->filter == sock_filter ) {
+                sock_filter_ctx_t *b = a->filter_ov;
+                b->keep_open = intval;
+                return 0;
+            }
+          #endif
+    }
+    else if ( cmd == 2 ) {  /* invalidate cache */
+        if ( !a && !intval && ptrval ) {
+          #ifndef FILE_FILTER_USES_STDIO
+            fd_cache_invalidate (ptrval);
+          #endif
+            return 0;
+        }
     }
-    else if( !(fp = fopen(fname, mode) ) )
-	return NULL;
-    a = iobuf_alloc(1, 8192 );
-    a->directfp = fp;
-    a->real_fname = m_strdup( fname );
-
-    if( DBG_IOBUF )
-	log_debug("iobuf_fopen -> %p\n", a->directfp );
 
-    return a;
+    return -1;
 }
 
 
-
 /****************
  * Register an i/o filter.
  */
@@ -1298,7 +1770,7 @@
  * Setting the limit to 0 disables this feature.
  */
 void
-iobuf_set_limit( IOBUF a, unsigned long nlimit )
+iobuf_set_limit( IOBUF a, off_t nlimit )
 {
     if( nlimit )
 	a->nofast |= 1;
@@ -1314,25 +1786,16 @@
 /****************
  * Return the length of an open file
  */
-u32
+off_t
 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) ) {
-          #if defined (HAVE_FOPEN64) && defined (HAVE_FSTAT64)
-            if( st.st_size >= IOBUF_FILELENGTH_LIMIT )
-                return IOBUF_FILELENGTH_LIMIT;
-          #endif
-	    return (u32)st.st_size;
-        }
+       if( !fstat(fileno(fp), &st) )
+           return st.st_size;
 	log_error("fstat() failed: %s\n", strerror(errno) );
 	return 0;
     }
@@ -1341,16 +1804,20 @@
     for( ; a; a = a->chain )
 	if( !a->chain && a->filter == file_filter ) {
 	    file_filter_ctx_t *b = a->filter_ov;
-	    FILE *fp = b->fp;
+	    FILEP_OR_FD fp = b->fp;
 
-	    if( !fstat(fileno(fp), &st) ) {
-              #if defined (HAVE_FOPEN64) && defined (HAVE_FSTAT64)
-                if( st.st_size >= IOBUF_FILELENGTH_LIMIT )
-                    return IOBUF_FILELENGTH_LIMIT;
-              #endif
+          #if defined(HAVE_DOSISH_SYSTEM) && !defined(FILE_FILTER_USES_STDIO)
+            ulong size;
+
+            if ( (size=GetFileSize (fp, NULL)) != 0xffffffff ) 
+                return size;
+            log_error ("GetFileSize for handle %p failed: ec=%d\n",
+                       fp, (int)GetLastError () );
+          #else
+            if( !fstat(my_fileno(fp), &st) )
 		return st.st_size;
-            }
 	    log_error("fstat() failed: %s\n", strerror(errno) );
+          #endif
 	    break;
 	}
 
@@ -1360,27 +1827,55 @@
 /****************
  * Tell the file position, where the next read will take place
  */
-ulong
+off_t
 iobuf_tell( IOBUF a )
 {
     return a->ntotal + a->nbytes;
 }
 
 
+#if !defined(HAVE_FSEEKO) && !defined(fseeko)
+
+#ifdef HAVE_LIMITS_H
+# include <limits.h>
+#endif
+#ifndef LONG_MAX
+# define LONG_MAX ((long) ((unsigned long) -1 >> 1))
+#endif
+#ifndef LONG_MIN
+# define LONG_MIN (-1 - LONG_MAX)
+#endif
+
+/****************
+ * A substitute for fseeko, for hosts that don't have it.
+ */
+static int
+fseeko( FILE *stream, off_t newpos, int whence )
+{
+    while( newpos != (long) newpos ) {
+       long pos = newpos < 0 ? LONG_MIN : LONG_MAX;
+       if( fseek( stream, pos, whence ) != 0 )
+           return -1;
+       newpos -= pos;
+       whence = SEEK_CUR;
+    }
+    return fseek( stream, (long)newpos, whence );
+}
+#endif
 
 /****************
  * This is a very limited implementation. It simply discards all internal
  * buffering and removes all filters but the first one.
  */
 int
-iobuf_seek( IOBUF a, ulong newpos )
+iobuf_seek( IOBUF a, off_t newpos )
 {
     file_filter_ctx_t *b = NULL;
 
     if( a->directfp ) {
 	FILE *fp = a->directfp;
-	if( fseek( fp, newpos, SEEK_SET ) ) {
-	    log_error("can't seek to %lu: %s\n", newpos, strerror(errno) );
+        if( fseeko( fp, newpos, SEEK_SET ) ) {
+            log_error("can't seek: %s\n", strerror(errno) );
 	    return -1;
 	}
 	clearerr(fp);
@@ -1394,10 +1889,25 @@
 	}
 	if( !a )
 	    return -1;
-	if( fseek( b->fp, newpos, SEEK_SET ) ) {
-	    log_error("can't seek to %lu: %s\n", newpos, strerror(errno) );
-	    return -1;
-	}
+#ifdef FILE_FILTER_USES_STDIO
+       if( fseeko( b->fp, newpos, SEEK_SET ) ) {
+           log_error("can't fseek: %s\n", strerror(errno) );
+           return -1;
+       }
+#else
+    #ifdef HAVE_DOSISH_SYSTEM
+       if (SetFilePointer (b->fp, newpos, NULL, FILE_BEGIN) == 0xffffffff ) {
+           log_error ("SetFilePointer failed on handle %p: ec=%d\n",
+                      b->fp, (int)GetLastError () );
+           return -1;
+       }
+    #else
+       if ( lseek (b->fp, newpos, SEEK_SET) == (off_t)-1 ) {
+           log_error("can't lseek: %s\n", strerror(errno) );
+           return -1;
+       }
+    #endif
+#endif
     }
     a->d.len = 0;   /* discard buffer */
     a->d.start = 0;
@@ -1575,4 +2085,59 @@
 
     return nbytes;
 }
+
+/* This is the non iobuf specific function */
+int
+iobuf_translate_file_handle ( int fd, int for_write )
+{
+  #ifdef __MINGW32__
+    {
+        int x;
+            
+        if  ( fd <= 2 )
+            return fd; /* do not do this for error, stdin, stdout, stderr */
+
+        x = _open_osfhandle ( fd, for_write? 1:0 );
+        if (x==-1 )
+            log_error ("failed to translate osfhandle %p\n", (void*)fd );
+        else {
+            /*log_info ("_open_osfhandle %p yields %d%s\n",
+              (void*)fd, x, for_write? " for writing":"" );*/
+            fd = x;
+        }
+    }
+  #endif
+    return fd;
+}
+
+static int
+translate_file_handle ( int fd, int for_write )
+{
+  #ifdef __MINGW32__
+   #ifdef FILE_FILTER_USES_STDIO  
+    fd = iobuf_translate_file_handle (fd, for_write);
+   #else
+    {
+        int x;
+
+        if  ( fd == 0 ) 
+            x = (int)GetStdHandle (STD_INPUT_HANDLE);
+        else if (fd == 1)    
+            x = (int)GetStdHandle (STD_OUTPUT_HANDLE);
+        else if (fd == 2)    
+            x = (int)GetStdHandle (STD_ERROR_HANDLE);
+        else
+            x = fd;
+
+        if (x == -1)
+            log_debug ("GetStdHandle(%d) failed: ec=%d\n",
+                       fd, (int)GetLastError () );
+
+        fd = x;
+    }
+   #endif
+  #endif
+    return fd;
+}
+
 
diff -urN gnupg-1.0.4/util/logger.c gnupg-1.0.5/util/logger.c
--- gnupg-1.0.4/util/logger.c	Mon Sep 18 11:24:16 2000
+++ gnupg-1.0.5/util/logger.c	Sun Apr 29 15:28:54 2001
@@ -1,5 +1,5 @@
 /* logger.c  -	log functions
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
diff -urN gnupg-1.0.4/util/memory.c gnupg-1.0.5/util/memory.c
--- gnupg-1.0.4/util/memory.c	Wed Jul  7 13:28:26 1999
+++ gnupg-1.0.5/util/memory.c	Sun Apr 29 15:29:24 2001
@@ -1,14 +1,5 @@
 /* memory.c  -	memory allocation
- *	Copyright (C) 1998 Free Software Foundation, Inc.
- *
- * We use our own memory allocation functions instead of plain malloc(),
- * so that we can provide some special enhancements:
- *  a) functions to provide memory from a secure memory.
- *  b) by looking at the requested allocation size we
- *     can reuse memory very quickly (e.g. MPI storage)
- *     (really needed?)
- *  c) memory usage reporting if compiled with M_DEBUG
- *  d) memory checking if compiled with M_GUARD
+ *	Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -25,6 +16,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ *
+ * We use our own memory allocation functions instead of plain malloc(),
+ * so that we can provide some special enhancements:
+ *  a) functions to provide memory from a secure memory.
+ *  b) by looking at the requested allocation size we
+ *     can reuse memory very quickly (e.g. MPI storage)
+ *     (really needed?)
+ *  c) memory usage reporting if compiled with M_DEBUG
+ *  d) memory checking if compiled with M_GUARD
  */
 
 #include <config.h>
@@ -42,6 +43,10 @@
 #define MAGIC_SEC_BYTE 0xcc
 #define MAGIC_END_BYTE 0xaa
 
+/* This is a very crude alignment check which does not work on all CPUs
+ * IIRC, I once introduced it for testing on an Alpha.  We should better
+ * replace this guard stuff with one provided by a modern malloc library
+ */
 #if SIZEOF_UNSIGNED_LONG == 8
   #define EXTRA_ALIGN 4
 #else
@@ -379,9 +384,14 @@
 static void
 out_of_core(size_t n, int secure)
 {
-    log_fatal("out of %s memory while allocating %u bytes\n",
-			secure? "secure":"" ,(unsigned)n );
-
+    log_error ("out of %s memory while allocating %u bytes\n",
+               secure? "secure":"" ,(unsigned)n );
+    if (secure) {
+        /*secmem_dump_stats ();*/
+        log_info ("(this may be caused by too many secret keys used "
+                  "simultaneously or due to excessive large key sizes)\n");
+    }
+    exit (2);
 }
 
 /****************
diff -urN gnupg-1.0.4/util/miscutil.c gnupg-1.0.5/util/miscutil.c
--- gnupg-1.0.4/util/miscutil.c	Mon Sep 18 11:08:36 2000
+++ gnupg-1.0.5/util/miscutil.c	Sat Apr 28 18:20:59 2001
@@ -1,5 +1,5 @@
 /* miscutil.c -  miscellaneous utilities
- *	Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -124,10 +124,15 @@
     static char buffer[11+5];
     struct tm *tp;
     time_t atime = stamp;
-
-    tp = gmtime( &atime );
-    sprintf(buffer,"%04d-%02d-%02d",
-		    1900+tp->tm_year, tp->tm_mon+1, tp->tm_mday );
+    
+    if (atime < 0) {
+        strcpy (buffer, "????-??-??");
+    }
+    else {
+        tp = gmtime( &atime );
+        sprintf(buffer,"%04d-%02d-%02d",
+                1900+tp->tm_year, tp->tm_mon+1, tp->tm_mday );
+    }
     return buffer;
 }
 
@@ -144,6 +149,11 @@
     struct tm *tp;
     time_t atime = stamp;
 
+    if (atime < 0) {
+        strcpy (buffer, "????-??-??");
+        return buffer;
+    }
+
     tp = localtime( &atime );
   #ifdef HAVE_STRFTIME
     #if defined(HAVE_NL_LANGINFO)
@@ -281,17 +291,17 @@
 
     if( !stricmp(s, long_yes ) )
 	return 1;
-    if( strchr( short_yes, *s ) && !s[1] )
+    if( *s && strchr( short_yes, *s ) && !s[1] )
 	return 1;
     /* test for no strings to catch ambiguities for the next test */
     if( !stricmp(s, long_no ) )
 	return 0;
-    if( strchr( short_no, *s ) && !s[1] )
+    if( *s && strchr( short_no, *s ) && !s[1] )
 	return 0;
     /* test for the english version (for those who are used to type yes) */
     if( !stricmp(s, "yes" ) )
 	return 1;
-    if( strchr( "yY", *s ) && !s[1] )
+    if( *s && strchr( "yY", *s ) && !s[1] )
 	return 1;
     return 0;
 }
@@ -316,19 +326,19 @@
 	return 1;
     if( !stricmp(s, long_quit ) )
 	return -1;
-    if( strchr( short_no, *s ) && !s[1] )
+    if( *s && strchr( short_no, *s ) && !s[1] )
 	return 0;
-    if( strchr( short_yes, *s ) && !s[1] )
+    if( *s && strchr( short_yes, *s ) && !s[1] )
 	return 1;
-    if( strchr( short_quit, *s ) && !s[1] )
+    if( *s && strchr( short_quit, *s ) && !s[1] )
 	return -1;
     if( !stricmp(s, "yes" ) )
 	return 1;
     if( !stricmp(s, "quit" ) )
 	return -1;
-    if( strchr( "yY", *s ) && !s[1] )
+    if( *s && strchr( "yY", *s ) && !s[1] )
 	return 1;
-    if( strchr( "qQ", *s ) && !s[1] )
+    if( *s && strchr( "qQ", *s ) && !s[1] )
 	return -1;
     return 0;
 }
diff -urN gnupg-1.0.4/util/secmem.c gnupg-1.0.5/util/secmem.c
--- gnupg-1.0.4/util/secmem.c	Mon Oct 16 17:43:41 2000
+++ gnupg-1.0.5/util/secmem.c	Sun Apr 29 15:30:42 2001
@@ -1,5 +1,5 @@
 /* secmem.c  -	memory allocation from a secure heap
- *	Copyright (C) 1998,1999 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -158,6 +158,10 @@
      * not make much sense.  However it is still of use because it
      * wipes out the memory on a free().
      * Therefore it is sufficient to suppress the warning
+     */
+  #elif defined (HAVE_DOSISH_SYSTEM)
+    /* It does not make sense to print such a warning, given the fact that 
+     * this whole Windows !@#$% and their user base are inherently insecure
      */
   #else
     log_info("Please note that you don't have secure memory on this system\n");
diff -urN gnupg-1.0.4/util/simple-gettext.c gnupg-1.0.5/util/simple-gettext.c
--- gnupg-1.0.4/util/simple-gettext.c	Fri Oct  8 20:34:56 1999
+++ gnupg-1.0.5/util/simple-gettext.c	Sun Apr 29 15:31:49 2001
@@ -1,5 +1,5 @@
 /* simple-gettext.c  - a simplified version of gettext.
- * Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1995, 1996, 1997, 1999 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -19,7 +19,7 @@
  */
 
 /* This is a simplified version of gettext written by Ulrich Drepper.
- * It is used for the Win32 version of GnuPG becuase all the overhead
+ * It is used for the Win32 version of GnuPG beucase all the overhead
  * of gettext is not needed and we have to do some special Win32 stuff.
  * I decided that this is far easier than to tweak gettext for the special
  * cases (I tried it but it is a lot of code).	wk 15.09.99
diff -urN gnupg-1.0.4/util/strgutil.c gnupg-1.0.5/util/strgutil.c
--- gnupg-1.0.4/util/strgutil.c	Mon Sep  4 10:25:57 2000
+++ gnupg-1.0.5/util/strgutil.c	Sat Apr 28 18:22:10 2001
@@ -1,5 +1,5 @@
 /* strgutil.c -  string utilities
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -67,7 +67,7 @@
 
 static const char *active_charset_name = "iso-8859-1";
 static ushort *active_charset = NULL;
-
+static int no_translation = 0;
 
 void
 free_strlist( STRLIST sl )
@@ -247,7 +247,7 @@
 
 
 
-unsigned
+unsigned int
 trim_trailing_chars( byte *line, unsigned len, const char *trimchars )
 {
     byte *p, *mark;
@@ -278,6 +278,37 @@
     return trim_trailing_chars( line, len, " \t\r\n" );
 }
 
+unsigned int
+check_trailing_chars( const byte *line, unsigned int len,
+                      const char *trimchars )
+{
+    const byte *p, *mark;
+    unsigned int n;
+
+    for(mark=NULL, p=line, n=0; n < len; n++, p++ ) {
+	if( strchr(trimchars, *p ) ) {
+	    if( !mark )
+		mark = p;
+	}
+	else
+	    mark = NULL;
+    }
+
+    if( mark ) {
+	return mark - line;
+    }
+    return len;
+}
+
+/****************
+ * remove trailing white spaces and return the length of the buffer
+ */
+unsigned int
+check_trailing_ws( const byte *line, unsigned int len )
+{
+    return check_trailing_chars( line, len, " \t\r\n" );
+}
+
 
 
 int
@@ -296,16 +327,24 @@
 {
     if( !stricmp( newset, "iso-8859-1" ) ) {
 	active_charset_name = "iso-8859-1";
+        no_translation = 0;
 	active_charset = NULL;
     }
     else if( !stricmp( newset, "iso-8859-2" ) ) {
 	active_charset_name = "iso-8859-2";
+        no_translation = 0;
 	active_charset = latin2_unicode;
     }
     else if( !stricmp( newset, "koi8-r" ) ) {
 	active_charset_name = "koi8-r";
+        no_translation = 0;
 	active_charset = koi8_unicode;
     }
+    else if( !stricmp (newset, "utf8" ) || !stricmp(newset, "utf-8") ) {
+	active_charset_name = "utf-8";
+        no_translation = 1;
+	active_charset = NULL;
+    }
     else
 	return G10ERR_GENERAL;
     return 0;
@@ -329,7 +368,10 @@
     byte *p;
     size_t length=0;
 
-    if( active_charset ) {
+    if (no_translation) {
+        buffer = m_strdup (string);
+    }
+    else if( active_charset ) {
 	for(s=string; *s; s++ ) {
 	    length++;
 	    if( *s & 0x80 )
@@ -393,6 +435,13 @@
     size_t slen;
     int resync = 0;
 
+    if (no_translation) {
+        buffer = m_alloc (length+1);
+        memcpy (buffer, string, length);
+        buffer[length] = 0; /* make sure it is a string */
+        return buffer;
+    }
+
     /* 1. pass (p==NULL): count the extended utf-8 characters */
     /* 2. pass (p!=NULL): create string */
     for( ;; ) {
@@ -422,11 +471,13 @@
 			  case '\v': n++; if( p ) *p++ = 'v'; break;
 			  case '\b': n++; if( p ) *p++ = 'b'; break;
 			  case	 0 : n++; if( p ) *p++ = '0'; break;
-			  default: n += 3;
-				   sprintf( p, "x%02x", *s );
-                                   if ( p )
-                                       p += 3;
-				   break;
+			  default:
+                            n += 3;
+                            if ( p ) {
+                                sprintf( p, "x%02x", *s );
+                                p += 3;
+                            }
+                            break;
 			}
 		    }
 		    else {
diff -urN gnupg-1.0.4/util/ttyio.c gnupg-1.0.5/util/ttyio.c
--- gnupg-1.0.4/util/ttyio.c	Mon Sep 18 11:25:04 2000
+++ gnupg-1.0.5/util/ttyio.c	Sat Apr 28 18:22:27 2001
@@ -1,5 +1,5 @@
 /* ttyio.c -  tty i/O functions
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -50,7 +50,11 @@
 #include "ttyio.h"
 
 #define CONTROL_D ('D' - 'A' + 1)
-
+#ifdef __VMS
+  #define TERMDEVICE "/dev/tty"
+#else
+  #define TERMDEVICE "/dev/tty"
+#endif
 
 #ifdef __MINGW32__ /* use the odd Win32 functions */
 static struct {
@@ -120,7 +124,7 @@
   #elif defined(__EMX__)
     ttyfp = stdout; /* Fixme: replace by the real functions: see wklib */
   #else
-    ttyfp = batchmode? stderr : fopen("/dev/tty", "r+");
+    ttyfp = batchmode? stderr : fopen(TERMDEVICE, "r+");
     if( !ttyfp ) {
 	log_error("cannot open /dev/tty: %s\n", strerror(errno) );
 	exit(2);
diff -urN gnupg-1.0.4/zlib/ChangeLog gnupg-1.0.5/zlib/ChangeLog
--- gnupg-1.0.4/zlib/ChangeLog	Sat Feb 13 12:19:13 1999
+++ gnupg-1.0.5/zlib/ChangeLog	Thu Mar  8 15:33:24 2001
@@ -235,7 +235,7 @@
 - use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
 - added makelcc.bat for lcc-win32 (Tom St Denis)
 - in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
-- Avoid expanded $Id: ChangeLog,v 1.4 1999/02/13 11:19:13 koch Exp $. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
+- Avoid expanded $Id: ChangeLog,v 1.4.2.1 2001/03/08 14:33:24 wkoch Exp $. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
 - check for unistd.h in configure (for off_t)
 - remove useless check parameter in inflate_blocks_free
 - avoid useless assignment of s->check to itself in inflate_blocks_new
@@ -489,3 +489,5 @@
 - use Z_FINISH instead of deflateEnd to finish compression.
 - added Z_HUFFMAN_ONLY
 - added gzerror()
+
+
diff -urN gnupg-1.0.4/zlib/Makefile.in gnupg-1.0.5/zlib/Makefile.in
--- gnupg-1.0.4/zlib/Makefile.in	Tue Oct 17 15:40:06 2000
+++ gnupg-1.0.5/zlib/Makefile.in	Sun Apr 29 16:38:55 2001
@@ -77,6 +77,7 @@
 DATADIRNAME = @DATADIRNAME@
 DLLTOOL = @DLLTOOL@
 DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
+DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@
 DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@
 DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@
 DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.5 (GNU/Linux)
Comment: For info see http://www.gnupg.org

iD8DBQE67ExBaLeriVdUjc0RAiYEAJwMnho3gIlHa4iFhFqn8mar6afVxQCfYEFq
G1cuLphcQ6dX/F/xeUHlGmU=
=cAEY
-----END PGP SIGNATURE-----