See ChangeLog: Wed Jul 14 19:42:08 CEST 1999 Werner Koch

22 files changed, 3006 insertions, 2655 deletions

diff --git a/README b/README
index 6dcfd41d6..5de8defe3 100644
--- a/README
+++ b/README
@@ -1,5 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-
 		    GnuPG - The GNU Privacy Guard
 		   -------------------------------
 			   Version 0.9.8
@@ -68,7 +66,7 @@
 
     3) "make install"
 
-    4) You end up with a "gpg" binray in /usr/local/bin.
+    4) You end up with a "gpg" binary in /usr/local/bin.
        Note: Because some programs rely on the existence of a
        binary named "gpgm"; you should install a symbolic link
        from gpgm to gpg:
@@ -447,12 +445,3 @@
 
     Have fun and remember: Echelon is looking at you kid.
 
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v0.9.7 (GNU/Linux)
-Comment: For info see http://www.gnupg.org
-
-iQB1AwUBN3SoBh0Z9MEMmFelAQE+9wL/bOTFEPvkO0drlWAu8k2P7udEzwfGlKhE
-Iyr6g75FSX4NnDkHB7RjyHYvQUkc8gicxYV8pBWe5c1bMYwrpe1cMvAu+BtUfDQc
-oHUbx9ln7CZ2BkEgzT5bjypugwtc6o7g
-=uTFn
------END PGP SIGNATURE-----
diff --git a/doc/DETAILS b/doc/DETAILS
index 6ff7cb656..d58567fdb 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -14,24 +14,33 @@ ssb::1536:20:5CE086B5B5A18FF4:1998-07-07:0:::
 	    fpr = fingerprint: (fingerprint is in field 10)
 	    pkd = public key data (special field format, see below)
 
- 2. Field:  A letter describing the calculated trust, see doc/FAQ
-	    This is a single letter, but be prepared that additional
-	    information may follow in some future versions.
-	    (not used for secret keys)
+ 2. Field:  A letter describing the calculated trust. This is a single
+	    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)
+		d = The key has been disabled
+		r = The key has been revoked
+		e = The key has expired
+		q = Undefined (no value assigned)
+		n = Don't trust this key at all
+		m = There is marginal trust in this key
+		f = The key is full trusted.
+		u = The key is ultimately trusted; this is only used for
+		    keys for which the secret key is also available.
  3. Field:  length of key in bits.
  4. Field:  Algorithm:	1 = RSA
 		       16 = ElGamal (encrypt only)
 		       17 = DSA (sometimes called DH, sign only)
 		       20 = ElGamal (sign and encrypt)
+            (for other id's see include/cipher.h)
  5. Field:  KeyID
  6. Field:  Creation Date (in UTC)
  7. Field:  Key expiration date or empty if none.
- 8. Field:  Local ID: record number of the dir record in the trustdb
-	    this value is only valid as long as the trustdb is not
-	    deleted.  May be later used to lookup the key: You will be
-	    able to use "#<local-id> as the user id.  This is needed
-	    because keyids may not be unique - a program may use this
-	    number to access keys later.
+ 8. Field:  Local ID: record number of the dir record in the trustdb.
+	    This value is only valid as long as the trustdb is not
+	    deleted. You can use "#<local-id> as the user id when
+	    specifying a key. This is needed because keyids may not be
+	    unique - a program may use this number to access keys later.
  9. Field:  Ownertrust (primary public keys only)
 	    This is a single letter, but be prepared that additional
 	    information may follow in some future versions.
@@ -158,6 +167,14 @@ more arguments in future versions.
     NO_SECKEY  <long keyid>
 	The key is not available
 
+    IMPORTED   <long keyid>  <username>
+	The keyid and name of the signature just imported
+
+    IMPORTED_RES <count> <no_user_id> <imported> <imported_rsa> <unchanged>
+	<n_uids> <n_subk> <n_sigs> <n_revoc> <sec_read> <sec_imported> <sec_dups>
+	Final statistics on import process (this is one long line)
+
+
 
 Key generation
 ==============
@@ -196,7 +213,7 @@ Layout of the TrustDB
 The TrustDB is built from fixed length records, where the first byte
 describes the record type.  All numeric values are stored in network
 byte order. The length of each record is 40 bytes. The first record of
-the DB is always of type 2 and this is the only record of this type.
+the DB is always of type 1 and this is the only record of this type.
 
   Record type 0:
   --------------
@@ -541,30 +558,28 @@ Status codes are:
 
 
 
-Ich werde jetzt doch das HKP Protokoll implementieren:
+Documentation on HKP (the http keyserver protocol):
 
-Naja, die Doku ist so gut wie nichtexistent, da gebe ich Dir recht.
-In kurzen Worten:
+A minimalistic HTTP server on port 11371 recognizes a GET for /pks/lookup.
+The standard http URL encoded query parameters are this (always key=value):
 
-(Minimal-)HTTP-Server auf Port 11371, versteht ein GET auf /pks/lookup,
-wobei die Query-Parameter (Key-Value-Paare mit = zwischen Key und
-Value; die Paare sind hinter ? und durch & getrennt). GЭltige
-Operationen sind:
+- op=index (like pgp -kv), op=vindex (like pgp -kvv) and op=get (like
+  pgp -kxa)
 
-- - op (Operation) mit den MЖglichkeiten index (gleich wie -kv bei
-  PGP), vindex (-kvv) und get (-kxa)
-- - search: Liste der Worte, die im Key vorkommen mЭssen. Worte sind
-  mit Worttrennzeichen wie Space, Punkt, @, ... getrennt, Worttrennzeichen
-  werden nicht betrachtet, die Reihenfolge der Worte ist egal.
-- - exact: (on=aktiv, alles andere inaktiv) Nur die SchlЭssel
-  zurЭckgeben, die auch den "search"-String beinhalten (d.h.
-  Wortreihenfolge und Sonderzeichen sind wichtig)
-- - fingerprint (Bei [v]index auch den Fingerprint ausgeben), "on"
-  fЭr aktiv, alles andere inaktiv
+- search=<stringlist>. This is a list of words that must occur in the key.
+  The words are delimited with space, points, @ and so on. The delimiters
+  are not searched for and the order of the words doesn't matter (but see
+  next option).
 
-Neu (wird von GNUPG benutzt):
-   /pks/lookup/<gnupg_formatierte_user_id>?op=<operation>
+- exact=on. This switch tells the hkp server to only report exact mathing
+  keys back. In this case the order and the "delimiters" are important.
+
+- fingerprint=on. Also reports the fingerprints when used with 'index' or
+  'vindex'
 
-ZusДtzlich versteht der Keyserver auch ein POST auf /pks/add, womit
-man Keys hochladen kann.
+New (already used by GnuPG):
+
+   /pks/lookup/<gnupg_formatierte_user_id>?op=<operation>
 
+The keyserver also recognizes http-POSTs to /pks/add. Use this to upload
+keys.
diff --git a/doc/FAQ b/doc/FAQ
index c57b490ae..c879f93aa 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -161,7 +161,7 @@
   on a local computer (a disconnected laptop is probably the best choice)
   and if you need it on your connected box (I know: We all do this) be
   sure to have a strong password for your account and for your secret key
-  and trust your Root.
+  and that you can trust your system administrator.
 
   When I check GnuPG on a remote system via ssh (I have no Alpha here ;-)
   I have the same problem.  It takes a *very* long time to create the
@@ -178,7 +178,7 @@
 
   You can see the validity (calculated trust value) using this command.
 
-      gpgm --list-keys --with-colons
+      gpg --list-keys --with-colons
 
   If the first field is "pub" or "uid", the second field shows you the trust:
 
@@ -199,7 +199,7 @@
   You can get a list of the assigned trust values (how much you trust
   the owner to correctly sign another person's key)
 
-      gpgm --list-ownertrust
+      gpg --list-ownertrust
 
   The first field is the fingerprint of the primary key, the second field
   is the assigned value:
diff --git a/doc/HACKING b/doc/HACKING
index 8b285cfcd..bc06a7064 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -30,7 +30,10 @@ by sending a mail with subject "subscribe" to
     gnupg-commit-watchers-request@gnupg.org
 
 
-Please run scripts/autogen.sh to create some required files.
+You must run scripts/autogen.sh before doing the ./configure,
+as this creates some needed while which are not in the CVS.
+autogen.sh should checks that you have all required tools
+installed.
 
 
 RSYNC access
@@ -41,6 +44,17 @@ of the CVS head revision is also available.  See rsync(1) and try
 
 
 
+Special Tools
+=============
+Documention is based on the docbook DTD.  Actually we have only the
+man page for now.  To build a man page you need the docbook-to-man
+tool and all the other thinks needed for SGML processing.  Debian
+comes with the docbook tools and you only need this docbook-to-man
+script which is comes with gtk-doc or download it from
+ftp.openit.de:/pub/devel/sgml.	If you don't have it everything
+should still work fine but you will have only a dummy man page.
+
+
 RFCs
 ====
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 26f83e32b..c5bdf3c98 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -7,17 +7,19 @@ man_MANS = gpg.1
 
 %.1 : %.sgml
 if HAVE_DOCBOOK_TO_MAN
-	  docbook-to-man $<  >$@
+	docbook-to-man $<  >$@
 else
-	  : Warning: missing docbook-to-man, cannot make $@
+	: Warning: missing docbook-to-man, cannot make $@
+	echo ".TH $< 1"   >$@
+	echo "No man page due to missing docbook-to-man" >>$@
 endif
 
 
 %.txt : %.sgml
-	 sgml2txt -c latin $*
+	sgml2txt -c latin $*
 
 %.html : %.sgml
-	 sgml2html -c latin $*
+	sgml2html -c latin $*
 
 %.dvi : %.sgml
 	-rm $*.sgml.tmp
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 8c1cff6b4..3b8ed4bbe 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,12 @@
+Wed Jul 14 19:42:08 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
+
+
+	* status.h (STATUS_IMPORTED): New.
+	* import.c (import): Print some status information (Holger Schurig).
+
+	* g10.c (main): Make --no-greeting work again. Add a warning when
+	--force-mds is used.
+
 Tue Jul 13 17:39:25 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
 
diff --git a/g10/g10.c b/g10/g10.c
index 4d66b5669..02210423e 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -212,7 +212,7 @@ static ARGPARSE_OPTS opts[] = {
     { aImportOwnerTrust,
 	      "import-ownertrust", 256 , N_("import ownertrust values")},
     { aUpdateTrustDB,
-	      "update-trustdb",0 , N_("|[NAMES]|update the trust database")},
+	      "update-trustdb",0 , N_("update the trust database")},
     { aCheckTrustDB,
 	      "check-trustdb",0 , N_("|[NAMES]|check the trust database")},
     { aFixTrustDB, "fix-trustdb",0 , N_("fix a corrupted trust database")},
@@ -526,6 +526,7 @@ main( int argc, char **argv )
     int default_config =1;
     int default_keyring = 1;
     int greeting = 0;
+    int nogreeting = 0;
     enum cmd_and_opt_values cmd = 0;
     const char *trustdb_name = NULL;
     char *def_cipher_string = NULL;
@@ -722,7 +723,7 @@ main( int argc, char **argv )
 	    break;
 	  case oNoArmor: opt.no_armor=1; opt.armor=0; break;
 	  case oNoDefKeyring: default_keyring = 0; break;
-	  case oNoGreeting: greeting = 0; break;
+	  case oNoGreeting: nogreeting = 1; break;
 	  case oNoVerbose: g10_opt_verbose = 0;
 			   opt.verbose = 0; opt.list_sigs=0; break;
 	  case oQuickRandom: quick_random_gen(1); break;
@@ -845,6 +846,8 @@ main( int argc, char **argv )
     m_free( configname ); configname = NULL;
     if( log_get_errorcount(0) )
 	g10_exit(2);
+    if( nogreeting )
+	greeting = 0;
 
     if( greeting ) {
 	fprintf(stderr, "%s %s; %s\n",
@@ -855,6 +858,11 @@ main( int argc, char **argv )
     if( !opt.batch )
 	log_info("NOTE: this is a development version!\n");
   #endif
+    if( opt.force_mdc ) {
+	log_info("--force-mdc ignored because"
+		 " the OpenPGP WG has not yet aggreed on MDCs\n");
+	opt.force_mdc = 0;
+    }
     if( opt.batch )
 	tty_batchmode( 1 );
 
diff --git a/g10/import.c b/g10/import.c
index a81c7edbf..6511c8e01 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -34,6 +34,7 @@
 #include "trustdb.h"
 #include "main.h"
 #include "i18n.h"
+#include "status.h"
 
 
 static struct {
@@ -199,6 +200,24 @@ import( IOBUF inp, int fast, const char* fname )
 	    log_info(_(" secret keys unchanged: %lu\n"), stats.secret_dups );
     }
 
+    if( is_status_enabled() ) {
+	char buf[12*16];
+	sprintf(buf, "%lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu",
+		count,
+		stats.no_user_id,
+		stats.imported,
+		stats.imported_rsa,
+		stats.unchanged,
+		stats.n_uids,
+		stats.n_subk,
+		stats.n_sigs,
+		stats.n_revoc,
+		stats.secret_read,
+		stats.secret_imported,
+		stats.secret_dups);
+	write_status_text( STATUS_IMPORT_RES, buf );
+    }
+
     return rc;
 }
 
@@ -385,6 +404,11 @@ import_one( const char *fname, KBNODE keyblock, int fast )
 	/* we are ready */
 	if( !opt.quiet )
 	    log_info( _("key %08lX: public key imported\n"), (ulong)keyid[1]);
+	if( is_status_enabled() ) {
+	    char *us = get_long_user_id_string( keyid );
+	    write_status_text( STATUS_IMPORTED, us );
+	    m_free(us);
+	}
 	stats.imported++;
 	if( is_RSA( pk->pubkey_algo ) )
 	    stats.imported_rsa++;
diff --git a/g10/status.c b/g10/status.c
index c29f54746..9f1c5a669 100644
--- a/g10/status.c
+++ b/g10/status.c
@@ -115,6 +115,8 @@ write_status_text ( int no, const char *text)
       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;
       default: s = "?\n"; break;
     }
 
diff --git a/g10/status.h b/g10/status.h
index 2cb72fec3..817b34a3c 100644
--- a/g10/status.h
+++ b/g10/status.h
@@ -63,6 +63,9 @@
 #define STATUS_GOODMDC		33
 #define STATUS_BADMDC		34
 #define STATUS_ERRMDC		35
+#define STATUS_IMPORTED 	36
+#define STATUS_IMPORT_RES	37
+
 
 /*-- status.c --*/
 void set_status_fd ( int fd );
diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index cce6ee56d..460e08b26 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 14 19:42:08 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
+
+
+	* Makefile.am: Use .s files as temporaries, disabled other .S rules.
+
 Wed Jul  7 13:08:40 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
 
diff --git a/mpi/Makefile.am b/mpi/Makefile.am
index e5c241a2e..ef9816aa5 100644
--- a/mpi/Makefile.am
+++ b/mpi/Makefile.am
@@ -1,5 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
+
 INCLUDES =  -I$(top_srcdir)/include
 CFLAGS = @CFLAGS@ @MPI_OPT_FLAGS@
 SFLAGS = @MPI_SFLAGS@
@@ -7,7 +8,8 @@ SFLAGS = @MPI_SFLAGS@
 EXTRA_DIST = config.links
 DISTCLEANFILES = mpih-add1.S mpih-mul1.S mpih-mul2.S mpih-mul3.S  \
 		 mpih-lshift.S mpih-rshift.S mpih-sub1.S asm-syntax.h sysdep.h
-CLEANFILES = tmp-*.s
+# Note: we only use .S files so we should delete all left over .s
+CLEANFILES = *.s
 
 noinst_LTLIBRARIES = libmpi.la
 
@@ -46,20 +48,13 @@ common_asm_objects = mpih-mul1.lo    \
 libmpi_la_DEPENDENCIES = $(common_asm_objects) @MPI_EXTRA_ASM_OBJS@
 libmpi_la_LIBADD = $(common_asm_objects) @MPI_EXTRA_ASM_OBJS@
 
-SUFFIXES = .S
-
+# cancel the default rules used by libtool which do not really
+# work and add one to cpp .S files
 .S.o:
-	$(CPP) $(INCLUDES) $(DEFS) $< | grep -v '^#' >tmp-$*.s
-	$(CC) $(CFLAGS) $(SFLAGS) -c tmp-$*.s
-	mv tmp-$*.o $@
-	rm -f tmp-$*.s
 
 .S.lo:
-	$(CPP) $(INCLUDES) $(DEFS) $< | grep -v '^#' >tmp-$*.s
-	if test -f tmp-$*.lo; then rm tmp-$*.lo; fi
-	if test -f tmp-$*.o ; then rm tmp-$*.o ; fi
-	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(SFLAGS) -c tmp-$*.s
-	if test -f tmp-$*.lo; then mv tmp-$*.lo $*.lo; fi
-	if test -f tmp-$*.o ; then mv tmp-$*.o	$*.o ; fi
-	rm -f tmp-$*.s
+
+.S.s:
+	 $(CPP) $(INCLUDES) $(DEFS) $< | grep -v '^#' >$*.s
+
 
diff --git a/po/de.po b/po/de.po
index 467a6403a..2d7cd784e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,7 +3,7 @@
 # Walter Koch <walterk@dip.de>, 1998.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-07-12 20:20+0200\n"
+"POT-Creation-Date: 1999-07-14 11:47+0200\n"
 "PO-Revision-Date: 1999-07-12 21:56+0200\n"
 "Last-Translator: Walter Koch <walterk@mail.dip.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -26,19 +26,19 @@ 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:156 util/miscutil.c:173
+#: util/miscutil.c:254 util/miscutil.c:271
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:157 util/miscutil.c:175
+#: util/miscutil.c:255 util/miscutil.c:273
 msgid "yY"
 msgstr "jJyY"
 
-#: g10/keyedit.c:561 util/miscutil.c:174
+#: g10/keyedit.c:564 util/miscutil.c:272
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:176
+#: util/miscutil.c:274
 msgid "qQ"
 msgstr "qQ"
 
@@ -244,11 +244,11 @@ msgstr "... dies ist ein Bug (Programmfehler) (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:452
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "WARNUNG: Der Zufallsgenerator erzeugt keine echten Zufallszahlen!\n"
 
-#: cipher/random.c:413
+#: cipher/random.c:453
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -274,7 +274,7 @@ msgstr ""
 "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
 "(Es werden noch %d Byte benЖtigt.)\n"
 
-#: g10/g10.c:174
+#: g10/g10.c:180
 msgid ""
 "@Commands:\n"
 " "
@@ -282,131 +282,138 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/g10.c:176
+#: g10/g10.c:182
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/g10.c:177
+#: g10/g10.c:183
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/g10.c:178
+#: g10/g10.c:184
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/g10.c:179
+#: g10/g10.c:185
 msgid "encrypt data"
 msgstr "Daten verschlЭsseln"
 
-#: g10/g10.c:180
+#: g10/g10.c:186
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschlЭsseln"
 
-#: g10/g10.c:181
+#: g10/g10.c:187
 msgid "store only"
 msgstr "Nur speichern"
 
-#: g10/g10.c:182
+#: g10/g10.c:188
 msgid "decrypt data (default)"
 msgstr "Daten entschlЭsseln (Voreinstellung)"
 
-#: g10/g10.c:183
+#: g10/g10.c:189
 msgid "verify a signature"
 msgstr "Signatur prЭfen"
 
-#: g10/g10.c:184
+#: g10/g10.c:190
 msgid "list keys"
 msgstr "Liste der SchlЭssel"
 
-#: g10/g10.c:186
+#: g10/g10.c:192
 msgid "list keys and signatures"
 msgstr "Liste der SchlЭssel und ihrer Signaturen"
 
-#: g10/g10.c:187
+#: g10/g10.c:193
 msgid "check key signatures"
 msgstr "Signaturen der SchlЭssel prЭfen"
 
-#: g10/g10.c:188
+#: g10/g10.c:194
 msgid "list keys and fingerprints"
 msgstr "Liste der SchlЭssel und ihrer \"FingerabdrЭcke\""
 
-#: g10/g10.c:189
+#: g10/g10.c:195
 msgid "list secret keys"
 msgstr "Liste der geheimen SchlЭssel"
 
-#: g10/g10.c:190
+#: g10/g10.c:196
 msgid "generate a new key pair"
 msgstr "Ein neues SchlЭsselpaar erzeugen"
 
-#: g10/g10.c:191
+#: g10/g10.c:197
 msgid "remove key from the public keyring"
 msgstr "SchlЭssel entfernen"
 
-#: g10/g10.c:192
+#: g10/g10.c:198
+#, fuzzy
+msgid "sign a key"
+msgstr "Den SchlЭssel signieren"
+
+#: g10/g10.c:199
+#, fuzzy
+msgid "sign a key locally"
+msgstr "Den SchlЭssel nur auf diesem Rechner signieren"
+
+#: g10/g10.c:200
 msgid "sign or edit a key"
 msgstr "Unterschreiben oder Bearbeiten eines SchlЭssels"
 
-#: g10/g10.c:193
+#: g10/g10.c:201
 msgid "generate a revocation certificate"
 msgstr "Ein SchlЭsselwiderruf-Zertifikat erzeugen"
 
-#: g10/g10.c:194
+#: g10/g10.c:202
 msgid "export keys"
 msgstr "SchlЭssel exportieren"
 
-#: g10/g10.c:195
+#: g10/g10.c:203
 msgid "export keys to a key server"
 msgstr "SchlЭssel zu einem SchlЭsselserver exportieren"
 
-#: g10/g10.c:196
+#: g10/g10.c:204
 msgid "import keys from a key server"
 msgstr "SchlЭssel von einem SchlЭsselserver importieren"
 
-#: g10/g10.c:199
+#: g10/g10.c:207
 msgid "import/merge keys"
 msgstr "SchlЭssel importieren/kombinieren"
 
-#: g10/g10.c:201
+#: g10/g10.c:209
 msgid "list only the sequence of packets"
 msgstr "Lediglich die Struktur der Datenpakete anzeigen"
 
-#: g10/g10.c:203
+#: g10/g10.c:211
 msgid "export the ownertrust values"
 msgstr "Exportieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:205
+#: g10/g10.c:213
 msgid "import ownertrust values"
 msgstr "Importieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:207
-msgid "|[NAMES]|update the trust database"
+#: g10/g10.c:215
+#, fuzzy
+msgid "update the trust database"
 msgstr "|[NAMEN]|дndern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:209
+#: g10/g10.c:217
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMEN]|эberprЭfen der \"Trust\"-Datenbank"
 
-#: g10/g10.c:210
+#: g10/g10.c:218
 msgid "fix a corrupted trust database"
 msgstr "Reparieren einer beschДdigten \"Trust\"-Datenbank"
 
-#: g10/g10.c:211
+#: g10/g10.c:219
 msgid "De-Armor a file or stdin"
 msgstr "Datei oder stdin von der ASCII-HЭlle befreien"
 
-#: g10/g10.c:212
+#: g10/g10.c:220
 msgid "En-Armor a file or stdin"
 msgstr "Datei oder stdin in eine ASCII-HЭlle einpacken"
 
-#: g10/g10.c:213
+#: g10/g10.c:221
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests fЭr die Dateien ausgeben"
 
-#: g10/g10.c:214
-msgid "print all message digests"
-msgstr "Message-Digests fЭr die Eingabedaten ausgeben"
-
-#: g10/g10.c:220
+#: g10/g10.c:225
 msgid ""
 "@\n"
 "Options:\n"
@@ -416,160 +423,171 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/g10.c:222
+#: g10/g10.c:227
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-HЭlle versehen"
 
-#: g10/g10.c:223
+#: g10/g10.c:228
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|VerschlЭsseln fЭr NAME"
 
-#: g10/g10.c:227
+#: g10/g10.c:231
+#, fuzzy
+msgid "|NAME|use NAME as default recipient"
+msgstr "|NAME|NAME als voreingestellten SchlЭssel benutzen"
+
+#: g10/g10.c:233
+msgid "use the default key as default recipient"
+msgstr ""
+
+#: g10/g10.c:237
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/g10.c:228
+#: g10/g10.c:238
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine Kompr.)"
 
-#: g10/g10.c:230
+#: g10/g10.c:240
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/g10.c:231
+#: g10/g10.c:241
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/g10.c:232
+#: g10/g10.c:242
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/g10.c:233
+#: g10/g10.c:243
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: g10/g10.c:234
+#: g10/g10.c:244
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: g10/g10.c:235
+#: g10/g10.c:245
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#: g10/g10.c:236
+#: g10/g10.c:246
 msgid "always use a MDC for encryption"
 msgstr "Beim VerschlЭsseln ein Siegel (MDC) verwenden"
 
-#: g10/g10.c:237
+#: g10/g10.c:247
 msgid "do not make any changes"
 msgstr "Keine wirklichen дnderungen durchfЭhren"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:239
+#: g10/g10.c:249
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: g10/g10.c:240
+#: g10/g10.c:250
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: g10/g10.c:241
+#: g10/g10.c:251
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: g10/g10.c:242
+#: g10/g10.c:252
 msgid "add this keyring to the list of keyrings"
 msgstr "Als Жffentlichen SchlЭsselbund mitbenutzen"
 
-#: g10/g10.c:243
+#: g10/g10.c:253
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen SchlЭsselbund mitbenutzen"
 
-#: g10/g10.c:244
+#: g10/g10.c:254
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten SchlЭssel benutzen"
 
-#: g10/g10.c:245
+#: g10/g10.c:255
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|SchlЭssel bei diesem Server nachschlagen"
 
-#: g10/g10.c:246
+#: g10/g10.c:256
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Terminalzeichensatz NAME benutzen"
 
-#: g10/g10.c:247
+#: g10/g10.c:257
 msgid "read options from file"
 msgstr "Optionen aus der Datei lesen"
 
-#: g10/g10.c:249
+#: g10/g10.c:259
 msgid "set debugging flags"
 msgstr "Debug-Flags einschalten"
 
-#: g10/g10.c:250
+#: g10/g10.c:260
 msgid "enable full debugging"
 msgstr "Alle Debug-Flags einschalten"
 
-#: g10/g10.c:251
+#: g10/g10.c:261
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/g10.c:252
+#: g10/g10.c:262
 msgid "do not write comment packets"
 msgstr "Keine Kommentarpakete schreiben"
 
-#: g10/g10.c:253
+#: g10/g10.c:263
 msgid "(default is 1)"
 msgstr "BenЖtigte Vollvertrauen (Voreinstellung 1)"
 
-#: g10/g10.c:254
+#: g10/g10.c:264
 msgid "(default is 3)"
 msgstr "BenЖtigte Teilvertrauen (Voreinstellung 3)"
 
-#: g10/g10.c:256
+#: g10/g10.c:266
 msgid "|FILE|load extension module FILE"
 msgstr "|DATEI|Erweiterungsmodul DATEI laden"
 
-#: g10/g10.c:257
+#: g10/g10.c:267
 msgid "emulate the mode described in RFC1991"
 msgstr "Den in RFC1991 beschriebenen Modus nachahmen"
 
-#: g10/g10.c:258
+#: g10/g10.c:268
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
-msgstr "alle Paket-, VerschlЭsselungs- und Hashoptionen auf OpenPGP-Verhalten einstellen"
+msgstr ""
+"alle Paket-, VerschlЭsselungs- und Hashoptionen auf OpenPGP-Verhalten "
+"einstellen"
 
-#: g10/g10.c:259
+#: g10/g10.c:269
 msgid "|N|use passphrase mode N"
 msgstr "|N|Verwenden des Mantra-Modus N"
 
-#: g10/g10.c:261
+#: g10/g10.c:271
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|Das Hashverfahren NAME fЭr Mantras benutzen"
 
-#: g10/g10.c:263
+#: g10/g10.c:273
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|Das VerschlЭ.verfahren NAME fЭr Mantras benutzen"
 
-#: g10/g10.c:264
+#: g10/g10.c:274
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Das VerschlЭ.verfahren NAME benutzen"
 
-#: g10/g10.c:265
+#: g10/g10.c:275
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Das Hashverfahren NAME benutzen"
 
-#: g10/g10.c:266
+#: g10/g10.c:276
 msgid "|N|use compress algorithm N"
 msgstr "|N|Die Komprimierverfahren N benutzen"
 
-#: g10/g10.c:267
+#: g10/g10.c:277
 msgid "throw keyid field of encrypted packets"
 msgstr "Entferne die Absender-ID verschlЭsselter Pakete"
 
-#: g10/g10.c:268
+#: g10/g10.c:278
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=WERT|verwende diese \"notation\"-Daten"
 
-#: g10/g10.c:270
+#: g10/g10.c:280
 msgid ""
 "@\n"
 "Examples:\n"
@@ -589,15 +607,15 @@ msgstr ""
 " --list-keys [Namen]        SchlЭssel anzeigen\n"
 " --fingerprint [Namen]      \"FingerabdrЭcke\" anzeigen\n"
 
-#: g10/g10.c:347
+#: g10/g10.c:360
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Berichte Эber Bugs (Programmfehler) bitte an <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:351
+#: g10/g10.c:364
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h fЭr Hilfe)"
 
-#: g10/g10.c:354
+#: g10/g10.c:367
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -607,7 +625,7 @@ msgstr ""
 "Signieren, prЭfen, verschlЭsseln, entschlЭsseln\n"
 "Die voreingestellte Operation ist abhДngig von den Eingabedaten\n"
 
-#: g10/g10.c:359
+#: g10/g10.c:372
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -615,161 +633,173 @@ msgstr ""
 "\n"
 "UnterstЭtzte Verfahren:\n"
 
-#: g10/g10.c:433
+#: g10/g10.c:446
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:473
+#: g10/g10.c:499
 msgid "conflicting commands\n"
 msgstr "WidersprЭchliche Befehle\n"
 
-#: g10/g10.c:605
+#: g10/g10.c:633
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:609
+#: g10/g10.c:637
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:616
+#: g10/g10.c:644
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:782
+#: g10/g10.c:824
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ist kein gЭltiger Zeichensatz.\n"
 
-#: g10/g10.c:827 g10/g10.c:839
+#: g10/g10.c:872 g10/g10.c:884
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewДhlte VerschlЭsslungsverfahren ist ungЭltig\n"
 
-#: g10/g10.c:833 g10/g10.c:845
+#: g10/g10.c:878 g10/g10.c:890
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewДhlte Hashverfahren ist ungЭltig\n"
 
-#: g10/g10.c:849
+#: g10/g10.c:894
 msgid "the given policy URL is invalid\n"
 msgstr "Die angegebene URL fЭr Richtlinien ist ungЭltig\n"
 
-#: g10/g10.c:852
+#: g10/g10.c:897
 #, 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:854
+#: g10/g10.c:899
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed mЭssen grЖъer als 0 sein\n"
 
-#: g10/g10.c:856
+#: g10/g10.c:901
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed mЭssen grЖъer als 1 sein\n"
 
-#: g10/g10.c:858
+#: g10/g10.c:903
 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:861
+#: g10/g10.c:906
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:865
+#: g10/g10.c:910
 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:942
+#: g10/g10.c:987
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:948
+#: g10/g10.c:993
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:955
+#: g10/g10.c:1000
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:963
+#: g10/g10.c:1008
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:976
+#: g10/g10.c:1021
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:989
+#: g10/g10.c:1034
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:1003
+#: g10/g10.c:1048
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:1015
+#: g10/g10.c:1060
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:1024
-msgid "--edit-key username [commands]"
+#: g10/g10.c:1068
+msgid "--sign-key user-id"
+msgstr ""
+
+#: g10/g10.c:1076
+#, fuzzy
+msgid "--lsign-key user-id"
+msgstr "--delete-key Benutzername"
+
+#: g10/g10.c:1084
+#, fuzzy
+msgid "--edit-key user-id [commands]"
 msgstr "--edit-key Username [Befehle]"
 
-#: g10/g10.c:1038
-msgid "--delete-secret-key username"
+#: g10/g10.c:1100
+#, fuzzy
+msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key Username"
 
-#: g10/g10.c:1041
-msgid "--delete-key username"
+#: g10/g10.c:1103
+#, fuzzy
+msgid "--delete-key user-id"
 msgstr "--delete-key Benutzername"
 
-#: g10/encode.c:231 g10/g10.c:1064 g10/sign.c:366
+#: g10/encode.c:231 g10/g10.c:1127 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "'%s' kann nicht geЖffnet werden: %s\n"
 
-#: g10/g10.c:1075
+#: g10/g10.c:1138
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [Benutzername] [Keyring]"
 
-#: g10/g10.c:1134
+#: g10/g10.c:1199
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-HЭlle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1142
+#: g10/g10.c:1207
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-HЭlle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1208
+#: g10/g10.c:1275
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "UngЭltiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:1283
+#: g10/g10.c:1356
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:1287
+#: g10/g10.c:1360
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1290 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1363 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht geЖffnet werden\n"
 
-#: g10/g10.c:1457
+#: g10/g10.c:1532
 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:1463
+#: g10/g10.c:1538
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -777,12 +807,12 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und muъ mit einem '=' enden\n"
 
-#: g10/g10.c:1469
+#: g10/g10.c:1544
 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:1477
+#: g10/g10.c:1552
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
@@ -861,7 +891,13 @@ msgstr ""
 "\"quoted printable\" Zeichen in der ASCII-HЭlle gefunden - mЖglicherweise\n"
 " war ein fehlerhafter E-Mail-Transporter(\"MTA\") die Ursache\n"
 
-#: g10/pkclist.c:137
+# valid user replies (not including 1..4)
+#. a string with valid answers
+#: g10/pkclist.c:140
+msgid "sSmMqQ"
+msgstr "sSmMqQ"
+
+#: g10/pkclist.c:144
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -870,7 +906,7 @@ msgstr ""
 "Es ist kein \"Owner trust\" fЭr %lu definiert:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:147
+#: g10/pkclist.c:154
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -893,29 +929,23 @@ msgstr ""
 " 4 = Ich vertraue ihm vollstДndig\n"
 " s = Bitte weitere Information anzeigen\n"
 
-#: g10/pkclist.c:156
+#: g10/pkclist.c:163
 msgid " m = back to the main menu\n"
 msgstr " m = ZurЭck zum MenЭ\n"
 
-#: g10/pkclist.c:158
+#: g10/pkclist.c:165
 msgid " q = quit\n"
 msgstr " q = verlassen\n"
 
-# valid user replies (not including 1..4)
-#. a string with valid answers
-#: g10/pkclist.c:163
-msgid "sSmMqQ"
-msgstr "sSmMqQ"
-
-#: g10/pkclist.c:167
+#: g10/pkclist.c:171
 msgid "Your decision? "
 msgstr "Ihre Auswahl? "
 
-#: g10/pkclist.c:187
+#: g10/pkclist.c:193
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Zertifikate fЭhren zu einem letztlich vertrauenswЭrdigen SchlЭssel:\n"
 
-#: g10/pkclist.c:254
+#: g10/pkclist.c:264
 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"
@@ -926,7 +956,7 @@ msgstr ""
 "ermitteln kЖnnen.\n"
 "\n"
 
-#: g10/pkclist.c:260
+#: g10/pkclist.c:270
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
@@ -934,7 +964,7 @@ msgstr ""
 "Kein Pfad fЭhrt zu einen unserer SchlЭsseln.\n"
 "\n"
 
-#: g10/pkclist.c:262
+#: g10/pkclist.c:272
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
@@ -942,7 +972,7 @@ msgstr ""
 "Keine Zertifikate mit undefinierten Vertrauen gefunden.\n"
 "\n"
 
-#: g10/pkclist.c:264
+#: g10/pkclist.c:274
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -950,38 +980,38 @@ msgstr ""
 "Keine \"trust\" Werte geДndert.\n"
 "\n"
 
-#: g10/pkclist.c:281
+#: g10/pkclist.c:291
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "SchlЭssel %08lX: SchlЭssel wurde widerrufen\n"
 
-#: g10/pkclist.c:287 g10/pkclist.c:297 g10/pkclist.c:403
+#: g10/pkclist.c:297 g10/pkclist.c:307 g10/pkclist.c:413
 msgid "Use this key anyway? "
 msgstr "Diesen SchlЭssel trotzdem benutzen?"
 
-#: g10/pkclist.c:291
+#: g10/pkclist.c:301
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "SchlЭssel %08lX: UnterschlЭssel wurde widerrufen\n"
 
-#: g10/pkclist.c:321
+#: g10/pkclist.c:331
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: SchlЭssel ist verfallen!\n"
 
-#: g10/pkclist.c:327
+#: g10/pkclist.c:337
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr ""
 "%08lX: Keine Infos zur Berechnung der Vertrauenswahrscheinlichkeit "
 "vorgefunden\n"
 
-#: g10/pkclist.c:341
+#: g10/pkclist.c:351
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: Wir haben KEIN Vertrauen zu diesem SchlЭssel!\n"
 
-#: g10/pkclist.c:347
+#: g10/pkclist.c:357
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -990,18 +1020,18 @@ msgstr ""
 "%08lX: Es ist nicht sicher, daъ dieser SchlЭssel wirklich dem vorgeblichen\n"
 "Besitzer gehЖrt, aber er wird trotzdem akzeptiert\n"
 
-#: g10/pkclist.c:353
+#: g10/pkclist.c:363
 msgid "This key probably belongs to the owner\n"
 msgstr ""
 "Dieser SchlЭssel gehЖrt hЖchstwahrscheinlich dem angegebenen Besitzer\n"
 
-#: g10/pkclist.c:358
+#: g10/pkclist.c:368
 msgid "This key belongs to us\n"
 msgstr ""
 "Dieser SchlЭssel gehЖrt uns (da wir nДmlich den geheimen SchlЭssel dazu "
 "haben)\n"
 
-#: g10/pkclist.c:398
+#: g10/pkclist.c:408
 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"
@@ -1012,69 +1042,69 @@ msgstr ""
 "Wenn Sie *wirklich* wissen, was Sie tun, kЖnnen Sie die nДchste\n"
 "Frage mit ja beantworten\n"
 
-#: g10/pkclist.c:411 g10/pkclist.c:433
+#: g10/pkclist.c:421 g10/pkclist.c:443
 msgid "WARNING: Using untrusted key!\n"
 msgstr "WARNUNG: Ein SchlЭssel ohne gesichertes Vertrauen wird benutzt!\n"
 
-#: g10/pkclist.c:454
+#: g10/pkclist.c:464
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "WARNUNG: Dieser SchlЭssel wurde von seinem Besitzer widerrufen!\n"
 
-#: g10/pkclist.c:455
+#: g10/pkclist.c:465
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Das kЖnnte bedeuten, daъ die Signatur gefДlscht ist.\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:469
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "WARNUNG: Dieser UnterschlЭssel wurde von seinem Besitzer widerrufen!\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:490
 msgid "Note: This key has expired!\n"
 msgstr "Hinweis: Dieser SchlЭssel ist verfallen!\n"
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:497
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "WARNUNG: Dieser SchlЭssel trДgt keine vertrauenswЭrdige Signatur!\n"
 
-#: g10/pkclist.c:489
+#: g10/pkclist.c:499
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Es gibt keinen Hinweis, daъ die Signatur wirklich dem vorgeblichen "
 "Besitzer gehЖrt.\n"
 
-#: g10/pkclist.c:505
+#: g10/pkclist.c:515
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem SchlЭssel!\n"
 
-#: g10/pkclist.c:506
+#: g10/pkclist.c:516
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Die Signatur ist wahrscheinlich eine FдLSCHUNG.\n"
 
-#: g10/pkclist.c:513
+#: g10/pkclist.c:523
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "WARNUNG: Dieser SchlЭssel ist nicht durch hinreichend vertrauenswЭrdige "
 "Signaturen zertifiziert!\n"
 
-#: g10/pkclist.c:516
+#: g10/pkclist.c:526
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "         Es ist nicht sicher, daъ die Signatur wirklich dem vorgeblichen "
 "Besitzer gehЖrt.\n"
 
-#: g10/pkclist.c:580 g10/pkclist.c:602 g10/pkclist.c:665 g10/pkclist.c:705
+#: g10/pkclist.c:627 g10/pkclist.c:649 g10/pkclist.c:758 g10/pkclist.c:803
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: Эbersprungen: %s\n"
 
-#: g10/pkclist.c:588 g10/pkclist.c:687
+#: g10/pkclist.c:635 g10/pkclist.c:785
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: Эbersprungen: Жffentlicher SchlЭssel bereits vorhanden\n"
 
-#: g10/pkclist.c:611
+#: g10/pkclist.c:662
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1082,20 +1112,34 @@ msgstr ""
 "Sie gaben keine User-ID angegeben (Benutzen Sie die Option \"-r\").\n"
 "\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:672
 msgid "Enter the user ID: "
 msgstr "Geben Sie die User-ID ein: "
 
-#: g10/pkclist.c:627
+#: g10/pkclist.c:684
 msgid "No such user ID.\n"
 msgstr "Keine solche User-ID vorhanden.\n"
 
-#: g10/pkclist.c:673
+#: g10/pkclist.c:704
+#, fuzzy
+msgid "Public key is disabled.\n"
+msgstr "жffentlicher SchlЭssel ist %08lX\n"
+
+#: g10/pkclist.c:733
+msgid "unknown default recipient `s'\n"
+msgstr ""
+
+#: g10/pkclist.c:766
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: Fehler beim PrЭfen des SchlЭssels: %s\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:771
+#, fuzzy, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr "%s: Эbersprungen: Жffentlicher SchlЭssel bereits vorhanden\n"
+
+#: g10/pkclist.c:809
 msgid "no valid addressees\n"
 msgstr "Keine gЭltigen Adressaten\n"
 
@@ -1238,29 +1282,29 @@ msgstr ""
 "      <n>m = SchlЭssel verfДllt nach n Monaten\n"
 "      <n>y = SchlЭssel verfДllt nach n Jahren\n"
 
-#: g10/keygen.c:524
+#: g10/keygen.c:526
 msgid "Key is valid for? (0) "
 msgstr "Der SchlЭssel bleibt wie lange gЭltig? (0) "
 
-#: g10/keygen.c:535
+#: g10/keygen.c:547
 msgid "invalid value\n"
 msgstr "UngЭltiger Wert.\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:552
 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:546
+#: g10/keygen.c:558
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Der SchlЭssel verfДllt am %s\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:564
 msgid "Is this correct (y/n)? "
 msgstr "Ist dies richtig? (j/n) "
 
-#: g10/keygen.c:595
+#: g10/keygen.c:607
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1276,44 +1320,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:606
+#: g10/keygen.c:618
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:610
+#: g10/keygen.c:622
 msgid "Invalid character in name\n"
 msgstr "UngЭltiges Zeichen im Namen\n"
 
-#: g10/keygen.c:612
+#: g10/keygen.c:624
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:614
+#: g10/keygen.c:626
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name muъ min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:622
+#: g10/keygen.c:634
 msgid "Email address: "
 msgstr "E-Mail-Adresse: "
 
-#: g10/keygen.c:633
+#: g10/keygen.c:645
 msgid "Not a valid email address\n"
 msgstr "Diese E-Mail-Adresse ist ungЭltig\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:653
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:647
+#: g10/keygen.c:659
 msgid "Invalid character in comment\n"
 msgstr "UngЭltiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:669
+#: g10/keygen.c:681
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:675
+#: g10/keygen.c:687
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1324,15 +1368,15 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:678
+#: g10/keygen.c:690
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:688
+#: g10/keygen.c:700
 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:740
+#: g10/keygen.c:752
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1340,11 +1384,11 @@ msgstr ""
 "Sie benЖtigen ein Mantra, um den geheimen SchlЭssel zu schЭtzen.\n"
 "\n"
 
-#: g10/keyedit.c:456 g10/keygen.c:748
+#: g10/keyedit.c:456 g10/keygen.c:760
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen.\n"
 
-#: g10/keygen.c:754
+#: g10/keygen.c:766
 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"
@@ -1357,7 +1401,7 @@ msgstr ""
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:775
+#: g10/keygen.c:787
 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"
@@ -1368,34 +1412,34 @@ msgstr ""
 "unterstЭtzen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
 "tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n"
 
-#: g10/keygen.c:845
+#: g10/keygen.c:857
 msgid "Key generation can only be used in interactive mode\n"
 msgstr ""
 "Die SchlЭsselerzeugung kann nur im interaktiven Modus benutzt werden.\n"
 
-#: g10/keygen.c:853
+#: g10/keygen.c:865
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Der DSA SchlЭssel wird 1024 Bits haben.\n"
 
-#: g10/keygen.c:859
+#: g10/keygen.c:871
 msgid "Key generation canceled.\n"
 msgstr "SchlЭsselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:869
+#: g10/keygen.c:881
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "schreiben des Жffentlichen Zertifikats nach '%s'\n"
 
-#: g10/keygen.c:870
+#: g10/keygen.c:882
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "schreiben des geheimen Zertifikats nach '%s'\n"
 
-#: g10/keygen.c:947
+#: g10/keygen.c:959
 msgid "public and secret key created and signed.\n"
 msgstr "жffentlichen und geheimen SchlЭssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:949
+#: g10/keygen.c:961
 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"
@@ -1404,12 +1448,12 @@ msgstr ""
 "werden kann.  Sie kЖnnen aber mit dem Befehl \"--edit-key\" einen\n"
 "ZweitschlЭssel fЭr diesem Zweck erzeugen.\n"
 
-#: g10/keygen.c:963 g10/keygen.c:1062
+#: g10/keygen.c:975 g10/keygen.c:1074
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "SchlЭsselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:105
+#: g10/keygen.c:1019 g10/sig-check.c:312 g10/sign.c:105
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1417,7 +1461,7 @@ msgstr ""
 "Der SchlЭssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht Эberein)\n"
 
-#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:107
+#: g10/keygen.c:1021 g10/sig-check.c:314 g10/sign.c:107
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1425,11 +1469,11 @@ msgstr ""
 "Der SchlЭssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht Эberein)\n"
 
-#: g10/keygen.c:1040
+#: g10/keygen.c:1052
 msgid "Really create? "
 msgstr "Wirklich erzeugen? "
 
-#: g10/encode.c:91 g10/openfile.c:118 g10/openfile.c:208 g10/tdbio.c:467
+#: g10/encode.c:91 g10/openfile.c:156 g10/openfile.c:246 g10/tdbio.c:467
 #: g10/tdbio.c:528
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1488,241 +1532,241 @@ 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/import.c:116
+#: g10/import.c:117
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht geЖffnet werden: %s\n"
 
-#: g10/import.c:160
+#: g10/import.c:161
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "Эberspringe den Block vom Typ %d\n"
 
-#: g10/import.c:167 g10/trustdb.c:1670 g10/trustdb.c:1711
+#: g10/import.c:168 g10/trustdb.c:1658 g10/trustdb.c:1697
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu SchlЭssel bislang bearbeitet\n"
 
-#: g10/import.c:172
+#: g10/import.c:173
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/import.c:175
+#: g10/import.c:176
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Anzahl insgesamt bearbeiteter SchlЭssel: %lu\n"
 
-#: g10/import.c:177
+#: g10/import.c:178
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         ohne User-ID: %lu\n"
 
-#: g10/import.c:179
+#: g10/import.c:180
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importiert: %lu"
 
-#: g10/import.c:185
+#: g10/import.c:186
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          unverДndert: %lu\n"
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "        neue User-IDs: %lu\n"
 
-#: g10/import.c:189
+#: g10/import.c:190
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "  neue UnterschlЭssel: %lu\n"
 
-#: g10/import.c:191
+#: g10/import.c:192
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        neue Signaturen: %lu\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "neue SchlЭsselwiderrufe: %lu\n"
 
-#: g10/import.c:195
+#: g10/import.c:196
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " gelesene geheime Schl.: %lu\n"
 
-#: g10/import.c:197
+#: g10/import.c:198
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "geheime SchlЭssel importiert: %lu\n"
 
-#: g10/import.c:199
+#: g10/import.c:200
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " unverДnderte geh.Schl.: %lu\n"
 
-#: g10/import.c:342 g10/import.c:529
+#: g10/import.c:361 g10/import.c:550
 #, c-format
 msgid "key %08lX: no user id\n"
 msgstr "SchlЭssel %08lX: Keine User-ID\n"
 
-#: g10/import.c:353
+#: g10/import.c:372
 #, c-format
 msgid "key %08lX: no valid user ids\n"
 msgstr "SchlЭssel %08lX: Keine gЭltigen User-IDs\n"
 
-#: g10/import.c:355
+#: g10/import.c:374
 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:366 g10/import.c:596
+#: g10/import.c:385 g10/import.c:617
 #, 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:372
+#: g10/import.c:391
 msgid "no default public keyring\n"
 msgstr "Kein voreingestellter Жffentlicher SchlЭsselbund\n"
 
-#: g10/import.c:376 g10/openfile.c:148 g10/sign.c:268 g10/sign.c:559
+#: g10/import.c:395 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
 
-#: g10/import.c:379 g10/import.c:435 g10/import.c:544 g10/import.c:645
+#: g10/import.c:398 g10/import.c:456 g10/import.c:565 g10/import.c:666
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "kann SchlЭsselbund `%s' nicht sperren: %s\n"
 
-#: g10/import.c:382 g10/import.c:438 g10/import.c:547 g10/import.c:648
+#: g10/import.c:401 g10/import.c:459 g10/import.c:568 g10/import.c:669
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des SchlЭsselbundes `%s': %s\n"
 
-#: g10/import.c:387
+#: g10/import.c:406
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "SchlЭssel %08lX: жffentlicher SchlЭssel importiert\n"
 
-#: g10/import.c:399
+#: g10/import.c:423
 #, 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:411 g10/import.c:604
+#: g10/import.c:432 g10/import.c:625
 #, 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:417 g10/import.c:610
+#: g10/import.c:438 g10/import.c:631
 #, 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:444
+#: g10/import.c:465
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
 msgstr "SchlЭssel %08lX: 1 neue User-ID\n"
 
-#: g10/import.c:447
+#: g10/import.c:468
 #, c-format
 msgid "key %08lX: %d new user-ids\n"
 msgstr "SchlЭssel %08lX: %d neue User-IDs\n"
 
-#: g10/import.c:450
+#: g10/import.c:471
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "SchlЭssel %08lX: 1 neue Signatur\n"
 
-#: g10/import.c:453
+#: g10/import.c:474
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "SchlЭssel %08lX: %d neue Signaturen\n"
 
-#: g10/import.c:456
+#: g10/import.c:477
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "SchlЭssel %08lX: 1 neuer UnterschlЭssel\n"
 
-#: g10/import.c:459
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "SchlЭssel %08lX: %d neue UnterschlЭssel\n"
 
-#: g10/import.c:469
+#: g10/import.c:490
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "SchlЭssel %08lX: Nicht geДndert\n"
 
-#: g10/import.c:552
+#: g10/import.c:573
 #, 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:556
+#: g10/import.c:577
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "SchlЭssel %08lX: Ist bereits im geheimen SchlЭsselbund\n"
 
-#: g10/import.c:561
+#: g10/import.c:582
 #, 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:590
+#: g10/import.c:611
 #, 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:621
+#: g10/import.c:642
 #, 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:653
+#: g10/import.c:674
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "SchlЭssel %08lX: Widerrufzertifikat importiert\n"
 
-#: g10/import.c:686
+#: g10/import.c:707
 #, 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:693 g10/import.c:717
+#: g10/import.c:714 g10/import.c:738
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "SchlЭssel %08lX: Nicht unterstЭtzetes Public-Key-Verfahren\n"
 
-#: g10/import.c:694
+#: g10/import.c:715
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "SchlЭssel %08lX: UngЭltige Eigenbeglaubigung\n"
 
-#: g10/import.c:709
+#: g10/import.c:730
 #, 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:718
+#: g10/import.c:739
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "SchlЭssel %08lX: UngЭltige UnterschlЭssel-Anbindung\n"
 
-#: g10/import.c:750
+#: g10/import.c:771
 #, c-format
 msgid "key %08lX: skipped userid '"
 msgstr "SchlЭssel %08lX: Эbergehe User-ID '"
 
-#: g10/import.c:773
+#: g10/import.c:794
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "SchlЭssel %08lX: UnterschlЭssel ignoriert\n"
@@ -1731,32 +1775,32 @@ msgstr "SchlЭssel %08lX: UnterschlЭssel ignoriert\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:798
+#: g10/import.c:819
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "SchlЭssel %08lX: Nicht exportfДhige Unterschrift - Эbergangen\n"
 
-#: g10/import.c:807
+#: g10/import.c:828
 #, 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:815
+#: g10/import.c:836
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "SchlЭssel %08lX: UngЭltiges Widerrufzertifikat: %s - Эbergangen\n"
 
-#: g10/import.c:915
+#: g10/import.c:936
 #, 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:966
+#: g10/import.c:987
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "SchlЭssel %08lX: Widerrufzertifikat hinzugefЭgt\n"
 
-#: g10/import.c:1079 g10/import.c:1134
+#: g10/import.c:1100 g10/import.c:1155
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "SchlЭssel %08lX: Unsere Kopie hat keine Eigenbeglaubigung\n"
@@ -1842,7 +1886,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Wirklich unterschreiben? "
 
-#: g10/keyedit.c:370 g10/keyedit.c:1800 g10/keyedit.c:1849 g10/sign.c:128
+#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:128
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
@@ -1884,380 +1928,385 @@ msgstr "MЖchten Sie dies wirklich tun? "
 msgid "moving a key signature to the correct place\n"
 msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:564
 msgid "quit this menu"
 msgstr "MenЭ verlassen"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:565
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:563
+#: g10/keyedit.c:566
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:563
+#: g10/keyedit.c:566
 msgid "save and quit"
 msgstr "speichern und MenЭ verlassen"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:567
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:567
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:569
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:569
 msgid "show fingerprint"
 msgstr "\"Fingerabdruck\" anzeigen"
 
-#: g10/keyedit.c:567
+#: g10/keyedit.c:570
 msgid "list"
 msgstr "Liste der SchlЭssel"
 
-#: g10/keyedit.c:567
+#: g10/keyedit.c:570
 msgid "list key and user ids"
 msgstr "SchlЭssel und User-ID auflisten"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:571
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:572
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:572
 msgid "select user id N"
 msgstr "User-ID N auswДhlen"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:573
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:573
 msgid "select secondary key N"
 msgstr "ZweitschlЭssel N auswДhlen"
 
-#: g10/keyedit.c:571
+#: g10/keyedit.c:574
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:571
+#: g10/keyedit.c:574
 msgid "list signatures"
 msgstr "Liste der Signaturen"
 
-#: g10/keyedit.c:572
+#: g10/keyedit.c:575
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:573
+#: g10/keyedit.c:576
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:573
+#: g10/keyedit.c:576
 msgid "sign the key"
 msgstr "Den SchlЭssel signieren"
 
-#: g10/keyedit.c:574
+#: g10/keyedit.c:577
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:578
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:578
 msgid "sign the key locally"
 msgstr "Den SchlЭssel nur auf diesem Rechner signieren"
 
-#: g10/keyedit.c:576
+#: g10/keyedit.c:579
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:580
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:580
 msgid "add a user id"
 msgstr "Eine User-ID hinzufЭgen"
 
-#: g10/keyedit.c:578
+#: g10/keyedit.c:581
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:578
+#: g10/keyedit.c:581
 msgid "delete user id"
 msgstr "User-ID entfernen"
 
-#: g10/keyedit.c:579
+#: g10/keyedit.c:582
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:579
+#: g10/keyedit.c:582
 msgid "add a secondary key"
 msgstr "Einen ZweitschlЭssel hinzufЭgen"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:583
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:583
 msgid "delete a secondary key"
 msgstr "Einen ZweitschlЭssel entfernen"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:584
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:584
 msgid "delete signatures"
 msgstr "Signatur entfernen"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:585
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:585
 msgid "change the expire date"
 msgstr "дndern des Verfallsdatums"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:586
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:586
 msgid "toggle between secret and public key listing"
 msgstr "Umschalten zwischen Anzeige geheimer und Жffentlicher SchlЭssel"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:588
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:589
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:589
 msgid "list preferences"
 msgstr "Liste der Voreinstellungen"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:590
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:590
 msgid "change the passphrase"
 msgstr "Das Mantra Дndern"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 msgid "change the ownertrust"
 msgstr "Den \"Owner trust\" Дndern"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:592
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:592
 msgid "revoke signatures"
 msgstr "Signaturen widerrufen"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:593
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:593
 msgid "revoke a secondary key"
 msgstr "Einen ZweitschlЭssel widerrufen"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:594
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:594
 msgid "disable a key"
 msgstr "SchlЭssel abschalten"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:595
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:595
 msgid "enable a key"
 msgstr "SchlЭssel anschalten"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:614
 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:640
+#. fixme: check that they both match
+#: g10/keyedit.c:652
 msgid "Secret key is available.\n"
 msgstr "Geheimer SchlЭssel ist vorhanden.\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:681
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:711
 msgid "Need the secret key to do this.\n"
 msgstr "Hierzu wird der geheime SchlЭssel benЖtigt.\n"
 
-#: g10/keyedit.c:718
-msgid "Save changes? "
-msgstr "дnderungen speichern? "
-
-#: g10/keyedit.c:721
-msgid "Quit without saving? "
-msgstr "Beenden ohne zu speichern? "
-
-#: g10/keyedit.c:731
-#, c-format
-msgid "update failed: %s\n"
-msgstr "дnderung fehlgeschlagen: %s\n"
-
-#: g10/keyedit.c:738
-#, c-format
-msgid "update secret failed: %s\n"
-msgstr "дnderung des Geheimnisses fehlgeschlagen: %s\n"
-
-#: g10/keyedit.c:745
-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:748 g10/keyedit.c:807
-#, c-format
-msgid "update of trustdb failed: %s\n"
-msgstr "дnderung der \"Trust-DB\" fehlgeschlagen: %s\n"
-
-#: g10/keyedit.c:781
+#: g10/keyedit.c:758
 msgid "Really sign all user ids? "
 msgstr "Wirklich alle User-IDs beglaubigen? "
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:759
 msgid "Hint: Select the user ids to sign\n"
 msgstr "Tip: WДhlen Sie die User-ID, die beglaubigt werden soll\n"
 
-#: g10/keyedit.c:818 g10/keyedit.c:839
+#: g10/keyedit.c:786 g10/keyedit.c:968
+#, c-format
+msgid "update of trustdb failed: %s\n"
+msgstr "дnderung der \"Trust-DB\" fehlgeschlagen: %s\n"
+
+#: g10/keyedit.c:797 g10/keyedit.c:818
 msgid "You must select at least one user id.\n"
 msgstr "Zumindestens eine User-ID muъ ausgewДhlt werden.\n"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:799
 msgid "You can't delete the last user id!\n"
 msgstr "Die letzte User-ID kann nicht gelЖscht werden!\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:802
 msgid "Really remove all selected user ids? "
 msgstr "MЖchten Sie alle ausgewДhlten User-IDs wirklich entfernen? "
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:803
 msgid "Really remove this user id? "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:860 g10/keyedit.c:882
+#: g10/keyedit.c:839 g10/keyedit.c:861
 msgid "You must select at least one key.\n"
 msgstr "Zumindestens ein SchlЭssel muъ ausgewДhlt werden.\n"
 
-#: g10/keyedit.c:864
+#: g10/keyedit.c:843
 msgid "Do you really want to delete the selected keys? "
 msgstr "MЖchten Sie die ausgewДhlten SchlЭssel wirklich entfernen? "
 
-#: g10/keyedit.c:865
+#: g10/keyedit.c:844
 msgid "Do you really want to delete this key? "
 msgstr "MЖchten Sie diesen SchlЭssel wirklich entfernen? "
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:865
 msgid "Do you really want to revoke the selected keys? "
 msgstr "MЖchten Sie die ausgewДhlten SchlЭssel wirklich widerrufen? "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:866
 msgid "Do you really want to revoke this key? "
 msgstr "MЖchten Sie diesen SchlЭssel wirklich wiederrufen? "
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:932
+msgid "Save changes? "
+msgstr "дnderungen speichern? "
+
+#: g10/keyedit.c:935
+msgid "Quit without saving? "
+msgstr "Beenden ohne zu speichern? "
+
+#: g10/keyedit.c:946
+#, c-format
+msgid "update failed: %s\n"
+msgstr "дnderung fehlgeschlagen: %s\n"
+
+#: g10/keyedit.c:953
+#, c-format
+msgid "update secret failed: %s\n"
+msgstr "дnderung des Geheimnisses fehlgeschlagen: %s\n"
+
+#: g10/keyedit.c:960
+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:975
 msgid "Invalid command  (try \"help\")\n"
 msgstr "UngЭltiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1065
+#, fuzzy
+msgid "This key has been disabled"
+msgstr "Hinweis: Dieser SchlЭssel ist verfallen!\n"
+
+#: g10/keyedit.c:1336
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:1308
+#: g10/keyedit.c:1340
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ungЭltige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1344
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1350
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1364
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:1333
+#: g10/keyedit.c:1365
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1368
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1437
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen SchlЭsseln.\n"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1443
 msgid "Please select at most one secondary key.\n"
 msgstr "Bitte wДhlen Sie hЖchstens einen ZweitschlЭssel aus.\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1447
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "дndern des Verfallsdatums des ZweitschlЭssels.\n"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1449
 msgid "Changing expiration time for the primary key.\n"
 msgstr "дndern des Verfallsdatums des HauptschlЭssels.\n"
 
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1490
 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:1474
+#: g10/keyedit.c:1506
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen SchlЭsselbund\n"
 
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1566
 #, c-format
 msgid "No user id with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:1580
+#: g10/keyedit.c:1612
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Kein ZweitschlЭssel mit Index %d\n"
 
-#: g10/keyedit.c:1678
+#: g10/keyedit.c:1710
 msgid "user ID: \""
 msgstr "User-ID: \""
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1713
 #, c-format
 msgid ""
 "\"\n"
@@ -2266,104 +2315,116 @@ msgstr ""
 "\"\n"
 "unterschrieben mit Ihrem SchlЭssel %08lX um %s\n"
 
-#: g10/keyedit.c:1685
+#: g10/keyedit.c:1717
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Ein Widerrufszertifikat fЭr diese Unterschrift erzeugen (j/N)"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1797
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1820
 msgid "no secret key\n"
 msgstr "Kein geheimer SchlЭssel\n"
 
-#: g10/mainproc.c:184
+#: g10/mainproc.c:213
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "жffentlicher SchlЭssel ist %08lX\n"
 
-#: g10/mainproc.c:212
+#: g10/mainproc.c:244
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit Жffentlichem SchЭssel verschlЭsselte Daten: Korrekte DEK\n"
 
-#. fixme: defer this message until we have parsed all packets of
-#. * this type - do this by building a list of keys with their stati
-#. * and store it with the context.  do_proc_packets can then use
-#. * this list to display some information
-#: g10/mainproc.c:219
+#: g10/mainproc.c:275
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
+msgstr "%u-Bit %s SchlЭssel, ID %08lX, erzeugt %s"
+
+# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muъ "ID" rein :-(
+#: g10/mainproc.c:285
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %08lX\n"
+msgstr "Unterschrift vom %.*s, %s SchlЭssel ID %08lX\n"
+
+#: g10/mainproc.c:291
+#, fuzzy
+msgid "no secret key for decryption available\n"
+msgstr "Geheimer SchlЭssel ist nicht vorhanden"
+
+#: g10/mainproc.c:293
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "EntschlЭsselung mit Жffentlichem SchlЭssel fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:247
+#: g10/mainproc.c:323
 msgid "decryption okay\n"
 msgstr "EnschlЭsselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:252
+#: g10/mainproc.c:328
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Warnung: VerschlЭsselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:257
+#: g10/mainproc.c:333
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "EnschlЭsselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:275
+#: g10/mainproc.c:351
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:277
+#: g10/mainproc.c:353
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "UrsprЭnglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:505 g10/mainproc.c:514
+#: g10/mainproc.c:580 g10/mainproc.c:589
 msgid "WARNING: invalid notation data found\n"
 msgstr "WARNUNG: UngЭltige \"Notation\"-Daten gefunden\n"
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:592
 msgid "Notation: "
 msgstr "\"Notation\": "
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:599
 msgid "Policy: "
 msgstr "Richtlinie: "
 
-#: g10/mainproc.c:929
+#: g10/mainproc.c:1018
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-эberprЭfung unterdrЭckt\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muъ "ID" rein :-(
-#: g10/mainproc.c:935
+#: g10/mainproc.c:1024
 #, 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:961 g10/mainproc.c:972
+#: g10/mainproc.c:1050 g10/mainproc.c:1061
 msgid "BAD signature from \""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:962 g10/mainproc.c:973
+#: g10/mainproc.c:1051 g10/mainproc.c:1062
 msgid "Good signature from \""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:964
+#: g10/mainproc.c:1053
 msgid "                aka \""
 msgstr "                    alias \""
 
-#: g10/mainproc.c:1015
+#: g10/mainproc.c:1104
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht geprЭft werden: %s\n"
 
-#: g10/mainproc.c:1109
+#: g10/mainproc.c:1198
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:1114
+#: g10/mainproc.c:1203
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ungЭltiges root-Paket in proc_tree() entdeckt\n"
 
@@ -2394,17 +2455,17 @@ msgstr ""
 "Diese VerschlЭsselungsmethode taugt nicht mehr viel; verwenden Sie eine "
 "stДrker standardisierte Methode!\n"
 
-#: g10/parse-packet.c:112
+#: g10/parse-packet.c:113
 #, 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:931
+#: g10/parse-packet.c:932
 #, 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:157
+#: g10/passphrase.c:159
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2414,21 +2475,26 @@ msgstr ""
 "Sie benЖtigen ein Mantra, um den geheimen SchlЭssel zu entsperren.\n"
 "Benutzer: \""
 
-#: g10/passphrase.c:166
+#: g10/passphrase.c:168
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-Bit %s SchlЭssel, ID %08lX, erzeugt %s"
 
-#: g10/passphrase.c:171
+#: g10/passphrase.c:173
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (HauptschlЭssel-ID %08lX)"
 
-#: g10/passphrase.c:192
+#: g10/passphrase.c:190
+#, fuzzy
+msgid "can't query password in batchmode\n"
+msgstr "Dies kann im Batchmodus nicht durchgefЭhrt werden.\n"
+
+#: g10/passphrase.c:194
 msgid "Enter passphrase: "
 msgstr "Geben Sie das Mantra ein: "
 
-#: g10/passphrase.c:196
+#: g10/passphrase.c:198
 msgid "Repeat passphrase: "
 msgstr "Geben Sie das Mantra nochmal ein: "
 
@@ -2483,37 +2549,37 @@ msgstr ""
 "WARNUNG: Unsicherer SchlЭssel entdeckt -\n"
 "         bitte Mantra nochmals wechseln.\n"
 
-#: g10/sig-check.c:187
+#: g10/sig-check.c:199
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr ""
 "Vermutlich ist das Siegel (MDC) BESCHдDIGT (wegen unbekanntem \"critical "
 "bit\")\n"
 
-#: g10/sig-check.c:283
+#: g10/sig-check.c:295
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "Dieser durch PGP erzeugte ElGamal-SchlЭssel ist fЭr Signaturen NICHT sicher "
 "genug!\n"
 
-#: g10/sig-check.c:291
+#: g10/sig-check.c:303
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr ""
 "жffentlicher SchlЭssel ist um %lu Sekunde jЭnger als die Unterschrift\n"
 
-#: g10/sig-check.c:292
+#: g10/sig-check.c:304
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr ""
 "жffentlicher SchlЭssel ist um %lu Sekunden jЭnger als die Unterschrift\n"
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:320
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "Hinweis: SchlЭssel der Signatur ist verfallen am %s.\n"
 
-#: g10/sig-check.c:365
+#: g10/sig-check.c:377
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "Vermutlich eine FALSCHE Unterschrift, wegen unbekanntem \"critical bit\"\n"
@@ -2581,7 +2647,7 @@ msgstr "%s: Verzeichnis erzeugt\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: Verzeichnis existiert nicht!\n"
 
-#: g10/openfile.c:144 g10/openfile.c:215 g10/ringedit.c:1344 g10/tdbio.c:457
+#: g10/openfile.c:182 g10/openfile.c:253 g10/ringedit.c:1344 g10/tdbio.c:457
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: kann nicht erzeugt werden: %s\n"
@@ -2680,321 +2746,298 @@ msgstr "%s: konnte Satz nicht anhДngen: %s\n"
 #: g10/tdbio.c:1759
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
-"Die \"Trust\"-Datenbank ist beschДdigt; verwenden Sie \"gpg --fix-trustdb\".\n"
+"Die \"Trust\"-Datenbank ist beschДdigt; verwenden Sie \"gpg "
+"--fix-trustdb\".\n"
 
-#: g10/trustdb.c:157
+#: g10/trustdb.c:160
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req type %d: read failed: %s\n"
 
-#: g10/trustdb.c:172
+#: g10/trustdb.c:175
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, type %d: write failed: %s\n"
 
-#: g10/trustdb.c:186
+#: g10/trustdb.c:189
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "Vertrauenssatz %lu: lЖschen fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:200
+#: g10/trustdb.c:203
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:347
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "Fehler beim Lesen des Dir-Satzes fЭr LID %lu: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:354
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: Dir-Satz erwartet, aber es kam Typ %d\n"
 
-#: g10/trustdb.c:356
+#: g10/trustdb.c:359
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "Kein HauptschlЭssel fЭr LID %lu\n"
 
-#: g10/trustdb.c:361
+#: g10/trustdb.c:364
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "Fehler beim Lesen den HauptschlЭssels der LID %lu: %s\n"
 
-#: g10/trustdb.c:400
+#: g10/trustdb.c:403
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:493
+#: g10/trustdb.c:458
 #, c-format
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "HINWEIS: Geheimer SchlЭssel %08lX ist NICHT geschЭtzt.\n"
 
-#: g10/trustdb.c:501
+#: g10/trustdb.c:466
 #, 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:508
+#: g10/trustdb.c:473
 #, c-format
 msgid "key %08lX: secret and public key don't match\n"
 msgstr ""
 "SchlЭssel %08lX: geheimer und Жffentlicher SchlЭssel passen nicht zusammen.\n"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:485
 #, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "SchlЭssel %08lX kann nicht in die \"trustdb\" eingefЭgt werden\n"
 
-#: g10/trustdb.c:524
+#: g10/trustdb.c:491
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "SchlЭssel %08lX: Satzabfrage fehlgeschlagen\n"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:500
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "SchlЭssel %08lX: Ist bereits in geheimer SchlЭsseltabelle\n"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:503
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "SchlЭssel %08lX: Akzeptiert als vertrauenswЭrdiger SchlЭssel.\n"
 
-#: g10/trustdb.c:544
+#: g10/trustdb.c:511
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enum_secret_keys fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:831
+#: g10/trustdb.c:802
 #, c-format
 msgid "tdbio_search_sdir failed: %s\n"
 msgstr "tdbio_search_sdir fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:899
-msgid "Too many preferences"
-msgstr "Zu viele Einstellungen"
-
-#: g10/trustdb.c:913
-msgid "Too many preference items"
-msgstr "Zu viele Angaben zur Bevorzugung"
-
-#: g10/trustdb.c:936 g10/trustdb.c:2555 g10/trustdb.c:2585
-msgid "WARNING: can't yet handle long pref records\n"
-msgstr "WARNUNG: Lange 'Pref'-Records kЖnnen noch nicht benutzt werden\n"
-
-#: g10/trustdb.c:1020
+#: g10/trustdb.c:877
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "SchlЭssel %08lX.%lu: Korrekte UnterschlЭssel-Anbindung\n"
 
-#: g10/trustdb.c:1026 g10/trustdb.c:1063
+#: g10/trustdb.c:883 g10/trustdb.c:918
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "SchlЭssel %08lX.%lu: UngЭltige UnterschlЭssel-Anbindung\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:895
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "SchlЭssel %08lX.%lu: GЭltiger SchlЭsselwiderruf\n"
 
-#: g10/trustdb.c:1044
+#: g10/trustdb.c:901
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "SchlЭssel %08lX.%lu: UngЭltiger SchlЭsselwiderruf: %s\n"
 
-#: g10/trustdb.c:1057
+#: g10/trustdb.c:912
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "SchlЭssel %08lX.%lu: GЭltiger UnterschlЭsselwiderruf\n"
 
-#: g10/trustdb.c:1153
+#: g10/trustdb.c:1023
 msgid "Good self-signature"
 msgstr "Korrekte Eigenbeglaubigung"
 
-#: g10/trustdb.c:1163
+#: g10/trustdb.c:1033
 msgid "Invalid self-signature"
 msgstr "UngЭltige Eigenbeglaubigung"
 
-#: g10/trustdb.c:1189
+#: g10/trustdb.c:1060
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "GЭltiger User-ID-Widerruf ignoriert, da eine neuere Eigenbeglaubigung "
 "vorliegt"
 
-#: g10/trustdb.c:1195
+#: g10/trustdb.c:1066
 msgid "Valid user ID revocation"
 msgstr "GЭltiger User-ID-Widerruf"
 
-#: g10/trustdb.c:1200
+#: g10/trustdb.c:1071
 msgid "Invalid user ID revocation"
 msgstr "UngЭltiger User-ID-Widerruf"
 
-#: g10/trustdb.c:1236
+#: g10/trustdb.c:1112
 msgid "Valid certificate revocation"
 msgstr "GЭltiger Zerifikat-Widerruf"
 
-#: g10/trustdb.c:1237
+#: g10/trustdb.c:1113
 msgid "Good certificate"
 msgstr "Korrektes Zertifikat"
 
-#: g10/trustdb.c:1258
+#: g10/trustdb.c:1134
 msgid "Invalid certificate revocation"
 msgstr "UngЭltiger Zertifikatswiderruf"
 
-#: g10/trustdb.c:1259
+#: g10/trustdb.c:1135
 msgid "Invalid certificate"
 msgstr "UngЭltiges Zertifikat"
 
-#: g10/trustdb.c:1276 g10/trustdb.c:1280
+#: g10/trustdb.c:1152 g10/trustdb.c:1156
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "Signatursatz %lu[%d] zeigt auf falschen Satz.\n"
 
-#: g10/trustdb.c:1330
+#: g10/trustdb.c:1208
 msgid "duplicated certificate - deleted"
 msgstr "Doppelte Zertifikate - entfernt"
 
-#. that should never happen
-#: g10/trustdb.c:1551
-#, c-format
-msgid "insert_trust_record: keyblock not found: %s\n"
-msgstr "insert_trust_record: SchlЭsselblock nicht gefunden: %s\n"
-
-#: g10/trustdb.c:1572
+#: g10/trustdb.c:1514
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1639
+#: g10/trustdb.c:1636
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: EinfЭgen fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1644
+#: g10/trustdb.c:1641
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: EinfЭgen fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1650
+#: g10/trustdb.c:1647
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: eingefЭgt\n"
 
-#: g10/trustdb.c:1655
-#, c-format
-msgid "lid %lu: update failed: %s\n"
-msgstr "lid %lu: дnderung fehlgeschlagen: %s\n"
-
-#: g10/trustdb.c:1661
-#, c-format
-msgid "lid %lu: updated\n"
-msgstr "lid %lu: geДndert\n"
-
-#: g10/trustdb.c:1666
-#, c-format
-msgid "lid %lu: okay\n"
-msgstr "lid %lu: In Ordnung\n"
+#: g10/trustdb.c:1652
+#, fuzzy, c-format
+msgid "error reading dir record: %s\n"
+msgstr "Fehler beim Auffinden des Verz.Satzes: %s\n"
 
-#: g10/trustdb.c:1672 g10/trustdb.c:1726
+#: g10/trustdb.c:1660 g10/trustdb.c:1714
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu SchlЭssel bearbeitet\n"
 
-#: g10/trustdb.c:1674 g10/trustdb.c:1730
+#: g10/trustdb.c:1662 g10/trustdb.c:1718
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu SchlЭssel mit Fehlern\n"
 
-#: g10/trustdb.c:1676 g10/trustdb.c:1732
-#, c-format
-msgid "\t%lu keys updated\n"
-msgstr "\t%lu SchlЭssel geДndert\n"
-
-#: g10/trustdb.c:1678
+#: g10/trustdb.c:1664
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu SchlЭssel eingefЭgt\n"
 
-#: g10/trustdb.c:1681
+#: g10/trustdb.c:1667
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumerate SchlЭsselblock fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1719
+#: g10/trustdb.c:1705
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: Dir-Satz ohne SchlЭssel - Эbergangen\n"
 
-#: g10/trustdb.c:1728
+#: g10/trustdb.c:1716
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu SchlЭssel Эbersprungen\n"
 
-#: g10/trustdb.c:2064
+#: g10/trustdb.c:1720
+#, c-format
+msgid "\t%lu keys updated\n"
+msgstr "\t%lu SchlЭssel geДndert\n"
+
+#: g10/trustdb.c:2057
 msgid "Ooops, no keys\n"
 msgstr "Huch, keine SchlЭssel\n"
 
-#: g10/trustdb.c:2068
+#: g10/trustdb.c:2061
 msgid "Ooops, no user ids\n"
 msgstr "Huch, keine User-IDs\n"
 
-#: g10/trustdb.c:2221
+#: g10/trustdb.c:2218
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: Suche nach Dir-Satz fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:2228
+#: g10/trustdb.c:2227
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "SchlЭssel %08lX: 'trust record' einfЭgen fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:2232
+#: g10/trustdb.c:2231
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "SchlЭssel %08lX.%lu: in \"trustdb\" eingefЭgt\n"
 
-#: g10/trustdb.c:2240
+#: g10/trustdb.c:2239
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "SchlЭssel %08lX.%lu: wurde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht Эberein)\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2248
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "SchlЭssel %08lX.%lu: verfallen am %s\n"
 
-#: g10/trustdb.c:2255
+#: g10/trustdb.c:2256
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "SchlЭssel %08lX.%lu: VertrauensprЭfung fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:2361
+#: g10/trustdb.c:2362
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "Benutzer '%s' nicht gefunden: %s\n"
 
-#: g10/trustdb.c:2363
+#: g10/trustdb.c:2364
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "Problem, '%s' in der Trust-DB zu finden: %s\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2367
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "User '%s' ist nicht in der 'Trust'-Datenbank - wird eingefЭgt\n"
 
-#: g10/trustdb.c:2369
+#: g10/trustdb.c:2370
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "konnte '%s' nicht in die 'Trust'-Datenbank hineintun: %s\n"
 
+#: g10/trustdb.c:2556 g10/trustdb.c:2586
+msgid "WARNING: can't yet handle long pref records\n"
+msgstr "WARNUNG: Lange 'Pref'-Records kЖnnen noch nicht benutzt werden\n"
+
 #: g10/ringedit.c:316
 #, c-format
 msgid "%s: can't create keyring: %s\n"
@@ -3058,16 +3101,21 @@ msgstr "эberschreiben (j/N)? "
 msgid "%s: unknown suffix\n"
 msgstr "%s: unbekannte Dateinamenerweiterung\n"
 
-#: g10/openfile.c:122
+#: g10/openfile.c:119
+#, fuzzy
+msgid "Enter new filename"
+msgstr "--store [Dateiname]"
+
+#: g10/openfile.c:160
 msgid "writing to stdout\n"
 msgstr "Schreiben auf die Standardausgabe\n"
 
-#: g10/openfile.c:181
+#: g10/openfile.c:219
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "die unterzeichneten Daten sind wohl in '%s'\n"
 
-#: g10/openfile.c:231
+#: g10/openfile.c:269
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: neue Optionendatei erstellt\n"
@@ -3202,24 +3250,24 @@ msgstr "Geben Sie \"Ja\" oder \"Nein\" ein"
 msgid "keygen.valid"
 msgstr "Geben Sie den erforderlichen Wert ein"
 
-#: g10/helptext.c:107
+#: g10/helptext.c:110
 msgid "keygen.valid.okay"
 msgstr "Geben Sie \"Ja\" oder \"Nein\" ein"
 
 # "Enter the name of the key holder"
-#: g10/helptext.c:112
+#: g10/helptext.c:115
 msgid "keygen.name"
 msgstr "Geben Sie den Namen des SchlЭsselinhabers ein"
 
 # "please enter an optional but highly suggested email address"
-#: g10/helptext.c:117
+#: g10/helptext.c:120
 msgid "keygen.email"
 msgstr ""
 "Geben Sie eine E-Mail-Adresse ein. Dies ist zwar nicht notwendig,\n"
 "aber empfehlenswert."
 
 # "Please enter an optional comment"
-#: g10/helptext.c:121
+#: g10/helptext.c:124
 msgid "keygen.comment"
 msgstr "Geben Sie (bei Bedarf) einen Kommentar ein"
 
@@ -3228,7 +3276,7 @@ msgstr "Geben Sie (bei Bedarf) einen Kommentar ein"
 # "E  to change the email address.\n"
 # "O  to continue with key generation.\n"
 # "Q  to to quit the key generation."
-#: g10/helptext.c:126
+#: g10/helptext.c:129
 msgid "keygen.userid.cmd"
 msgstr ""
 "N  um den Namen zu Дndern.\n"
@@ -3238,45 +3286,45 @@ msgstr ""
 "B  um die SchlЭsselerzeugung abbrechen."
 
 # "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-#: g10/helptext.c:135
+#: g10/helptext.c:138
 msgid "keygen.sub.okay"
 msgstr ""
 "Geben Sie \"Ja\" (oder nur \"j\") ein, um den UnterschlЭssel zu erzeugen."
 
 # "Answer \"yes\" or \"no\""
-#: g10/helptext.c:139
+#: g10/helptext.c:142
 msgid "sign_uid.okay"
 msgstr "Geben Sie \"Ja\" oder \"Nein\" ein"
 
 #  "Answer \"yes\" or \"no\""
-#: g10/helptext.c:144
+#: g10/helptext.c:147
 msgid "change_passwd.empty.okay"
 msgstr "Geben Sie \"Ja\" oder \"Nein\" ein"
 
 # "Answer \"yes\" or \"no\""
-#: g10/helptext.c:149
+#: g10/helptext.c:152
 msgid "keyedit.save.okay"
 msgstr "Geben Sie \"Ja\" oder \"Nein\" ein"
 
-#: g10/helptext.c:154
+#: g10/helptext.c:157
 msgid "keyedit.cancel.okay"
 msgstr "Geben Sie \"Ja\" oder \"Nein\" ein"
 
 # "Answer \"yes\" is you want to sign ALL the user IDs"
-#: g10/helptext.c:158
+#: g10/helptext.c:161
 msgid "keyedit.sign_all.okay"
 msgstr "Geben Sie \"Ja\" (oder nur \"j\") ein, um alle User-IDs zu beglaubigen"
 
 # "Answer \"yes\" if you really want to delete this user ID.\n"
 # "All ceritifcates are then also lost!"
-#: g10/helptext.c:162
+#: g10/helptext.c:165
 msgid "keyedit.remove.uid.okay"
 msgstr ""
 "Geben Sie \"Ja\" (oder nur \"j\") ein, um diese User-ID zu LжSCHEN.\n"
 "Alle Zertifikate werden dann auch weg sein!"
 
 # "Answer \"yes\" if it is okay to delete the subkey"
-#: g10/helptext.c:167
+#: g10/helptext.c:170
 msgid "keyedit.remove.subkey.okay"
 msgstr ""
 "Geben Sie \"Ja\" (oder nur \"j\") ein, um diesen UnterschlЭssel zu lЖschen"
@@ -3285,7 +3333,7 @@ msgstr ""
 # "This is a valid signature on the key; you normally don't want\n"
 # "to delete this signature may be important to establish a trust\n"
 # "connection to the key or another key certified by this key."
-#: g10/helptext.c:172
+#: g10/helptext.c:175
 msgid "keyedit.delsig.valid"
 msgstr ""
 "Dies ist eine gЭltige Beglaubigung fЭr den SchlЭssel. Es ist normalerweise\n"
@@ -3298,7 +3346,7 @@ msgstr ""
 # "corresponding key.  You should postpone its deletion until you\n"
 # "know which key was used because this signing key might establish"
 # "a trust connection through another already certified key."
-#: g10/helptext.c:177
+#: g10/helptext.c:180
 msgid "keyedit.delsig.unknown"
 msgstr ""
 "Diese Beglaubigung kann nicht geprЭft werden, da Sie den passenden SclЭssel\n"
@@ -3310,7 +3358,7 @@ msgstr ""
 # "The signature is not valid.  It does make sense to remove it from\n"
 # "your keyring if it is really invalid and not just unchecked due to\n"
 # "a missing public key (marked by \"sig?\")."
-#: g10/helptext.c:183
+#: g10/helptext.c:186
 msgid "keyedit.delsig.invalid"
 msgstr ""
 "Diese Beglaubigung ist ungЭltig. Es ist sinnvoll sie aus Ihrem\n"
@@ -3323,7 +3371,7 @@ msgstr ""
 # "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."
-#: g10/helptext.c:187
+#: g10/helptext.c:190
 msgid "keyedit.delsig.selfsig"
 msgstr ""
 "Diese Beglaubigung bindet die User-ID an den SchlЭssel. Normalerweise ist\n"
@@ -3336,7 +3384,7 @@ msgstr ""
 # ################################
 # ####### Help msgids ############
 # ################################
-#: g10/helptext.c:196
+#: g10/helptext.c:199
 msgid "passphrase.enter"
 msgstr ""
 "Bitte geben Sie das Mantra ein. Dies ist ein geheimer Satz, der aus\n"
@@ -3351,7 +3399,7 @@ msgstr ""
 "werden,\n"
 "sind i.d.R. eine gute Wahl"
 
-#: g10/helptext.c:203
+#: g10/helptext.c:206
 msgid "passphrase.repeat"
 msgstr ""
 "Um sicher zu gehen, daъ Sie sich bei der Eingabe des Mantras nicht\n"
@@ -3359,25 +3407,52 @@ msgstr ""
 "Эbereinstimmen, wird das Mantra akzeptiert."
 
 # "Give the name fo the file to which the signature applies"
-#: g10/helptext.c:207
+#: g10/helptext.c:210
 msgid "detached_signature.filename"
 msgstr ""
 "Geben Sie den Namen der Datei an, zu dem die abgetrennte Unterschrift gehЖrt"
 
 # "Answer \"yes\" if it is okay to overwrite the file"
-#: g10/helptext.c:211
+#. openfile.c (overwrite_filep)
+#: g10/helptext.c:215
 msgid "openfile.overwrite.okay"
 msgstr "Geben Sie \"ja\" ein, wenn Sie die Datei Эberschreiben mЖchten"
 
-#: g10/helptext.c:225
+#. openfile.c (ask_outfile_name)
+#: g10/helptext.c:220
+msgid "openfile.askoutname"
+msgstr ""
+
+#: g10/helptext.c:235
 msgid "No help available"
 msgstr "Keine Hilfe vorhanden."
 
-#: g10/helptext.c:237
+#: g10/helptext.c:247
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Keine Hilfe fЭr '%s' vorhanden."
 
+#~ msgid "print all message digests"
+#~ msgstr "Message-Digests fЭr die Eingabedaten ausgeben"
+
+#~ msgid "Too many preferences"
+#~ msgstr "Zu viele Einstellungen"
+
+#~ msgid "Too many preference items"
+#~ msgstr "Zu viele Angaben zur Bevorzugung"
+
+#~ msgid "insert_trust_record: keyblock not found: %s\n"
+#~ msgstr "insert_trust_record: SchlЭsselblock nicht gefunden: %s\n"
+
+#~ msgid "lid %lu: update failed: %s\n"
+#~ msgstr "lid %lu: дnderung fehlgeschlagen: %s\n"
+
+#~ msgid "lid %lu: updated\n"
+#~ msgstr "lid %lu: geДndert\n"
+
+#~ msgid "lid %lu: okay\n"
+#~ msgstr "lid %lu: In Ordnung\n"
+
 #~ msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n"
 #~ msgstr "Hinweis: sig rec %lu[%d] in hintlist of %lu but marked as checked\n"
 
@@ -3550,9 +3625,6 @@ msgstr "Keine Hilfe fЭr '%s' vorhanden."
 #~ msgid "insert trust record failed: %s\n"
 #~ msgstr "'trust record' einfЭgen fehlgeschlagen: %s\n"
 
-#~ msgid "error finding dir record: %s\n"
-#~ msgstr "Fehler beim Auffinden des Verz.Satzes: %s\n"
-
 #~ msgid "Hmmm, public key lost?"
 #~ msgstr "Hmmm, Жffentlicher SchЭssel verloren?"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index a8aa43fc7..f4bf992bf 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@
 # GPG version: 0.9.7
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-07-12 15:04+0200\n"
+"POT-Creation-Date: 1999-07-14 11:47+0200\n"
 "PO-Revision-Date: 1999-06-06 18:33+0200\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-13 10:49:25+0100\n"
@@ -42,7 +42,7 @@ msgstr "sМ"
 msgid "yY"
 msgstr "sS"
 
-#: g10/keyedit.c:561 util/miscutil.c:272
+#: g10/keyedit.c:564 util/miscutil.c:272
 msgid "quit"
 msgstr ""
 
@@ -283,7 +283,7 @@ msgstr ""
 "otro trabajo para que el sistema pueda recolectar mАs entropМa\n"
 "(se necesitan %d bytes mАs).\n"
 
-#: g10/g10.c:177
+#: g10/g10.c:180
 msgid ""
 "@Commands:\n"
 " "
@@ -291,131 +291,138 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:179
+#: g10/g10.c:182
 msgid "|[file]|make a signature"
 msgstr "|[file]|hace una firma"
 
-#: g10/g10.c:180
+#: g10/g10.c:183
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|hace una firma en texto claro"
 
-#: g10/g10.c:181
+#: g10/g10.c:184
 msgid "make a detached signature"
 msgstr "hace una firma separada"
 
-#: g10/g10.c:182
+#: g10/g10.c:185
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/g10.c:183
+#: g10/g10.c:186
 msgid "encryption only with symmetric cipher"
 msgstr "cifra sСlo con un cifrado simИtrico"
 
-#: g10/g10.c:184
+#: g10/g10.c:187
 msgid "store only"
 msgstr "sСlo almacenar"
 
-#: g10/g10.c:185
+#: g10/g10.c:188
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/g10.c:186
+#: g10/g10.c:189
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:187
+#: g10/g10.c:190
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/g10.c:189
+#: g10/g10.c:192
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/g10.c:190
+#: g10/g10.c:193
 msgid "check key signatures"
 msgstr "comprueba las firmas de las claves"
 
-#: g10/g10.c:191
+#: g10/g10.c:194
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/g10.c:192
+#: g10/g10.c:195
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/g10.c:193
+#: g10/g10.c:196
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/g10.c:194
+#: g10/g10.c:197
 msgid "remove key from the public keyring"
 msgstr "elimina la clave del anillo pЗblico"
 
-#: g10/g10.c:195
+#: g10/g10.c:198
+#, fuzzy
+msgid "sign a key"
+msgstr "firma la clave"
+
+#: g10/g10.c:199
+#, fuzzy
+msgid "sign a key locally"
+msgstr "firma la clave localmente"
+
+#: g10/g10.c:200
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/g10.c:196
+#: g10/g10.c:201
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaciСn"
 
-#: g10/g10.c:197
+#: g10/g10.c:202
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/g10.c:198
+#: g10/g10.c:203
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/g10.c:199
+#: g10/g10.c:204
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/g10.c:202
+#: g10/g10.c:207
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/g10.c:204
+#: g10/g10.c:209
 msgid "list only the sequence of packets"
 msgstr "lista sСlo la secuencia de paquetes"
 
-#: g10/g10.c:206
+#: g10/g10.c:211
 msgid "export the ownertrust values"
 msgstr "exporta los valores de confianza"
 
-#: g10/g10.c:208
+#: g10/g10.c:213
 msgid "import ownertrust values"
 msgstr "importa los valores de confianza"
 
-#: g10/g10.c:210
-msgid "|[NAMES]|update the trust database"
+#: g10/g10.c:215
+#, fuzzy
+msgid "update the trust database"
 msgstr "|[NOMBRES]|actualiza la base de datos de confianza"
 
-#: g10/g10.c:212
+#: g10/g10.c:217
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMBRES]|comprueba la base de datos de confianza"
 
-#: g10/g10.c:213
+#: g10/g10.c:218
 msgid "fix a corrupted trust database"
 msgstr "arregla una base de datos de confianza daЯada"
 
-#: g10/g10.c:214
+#: g10/g10.c:219
 msgid "De-Armor a file or stdin"
 msgstr "quita la armadura de un fichero o stdin"
 
-#: g10/g10.c:215
+#: g10/g10.c:220
 msgid "En-Armor a file or stdin"
 msgstr "crea la armadura a un fichero o stdin"
 
-#: g10/g10.c:216
+#: g10/g10.c:221
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime resЗmenes de mensaje"
 
-#: g10/g10.c:217
-msgid "print all message digests"
-msgstr "imprime todos los resЗmenes de mensaje"
-
-#: g10/g10.c:223
+#: g10/g10.c:225
 msgid ""
 "@\n"
 "Options:\n"
@@ -425,164 +432,173 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/g10.c:225
+#: g10/g10.c:227
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/g10.c:226
+#: g10/g10.c:228
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
+#, fuzzy
+msgid "|NAME|use NAME as default recipient"
+msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
+
+#: g10/g10.c:233
+msgid "use the default key as default recipient"
+msgstr ""
+
+#: g10/g10.c:237
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/g10.c:231
+#: g10/g10.c:238
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|establece nivel de compresiСn N (0 no comprime)"
 
-#: g10/g10.c:233
+#: g10/g10.c:240
 msgid "use canonical text mode"
 msgstr "usa modo de texto canСnico"
 
-#: g10/g10.c:234
+#: g10/g10.c:241
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/g10.c:235
+#: g10/g10.c:242
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/g10.c:236
+#: g10/g10.c:243
 msgid "be somewhat more quiet"
 msgstr "algo mАs discreto"
 
-#: g10/g10.c:237
+#: g10/g10.c:244
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: g10/g10.c:238
+#: g10/g10.c:245
 msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:239
+#: g10/g10.c:246
 msgid "always use a MDC for encryption"
 msgstr "siempre usa un MCD para cifrar"
 
-#: g10/g10.c:240
+#: g10/g10.c:247
 msgid "do not make any changes"
 msgstr "no hace ningЗn cambio"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:242
+#: g10/g10.c:249
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
-#: g10/g10.c:243
+#: g10/g10.c:250
 msgid "assume yes on most questions"
 msgstr "asume \"sМ\" en casi todas las preguntas"
 
-#: g10/g10.c:244
+#: g10/g10.c:251
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: g10/g10.c:245
+#: g10/g10.c:252
 msgid "add this keyring to the list of keyrings"
 msgstr "aЯade este anillo a la lista de anillos"
 
-#: g10/g10.c:246
+#: g10/g10.c:253
 msgid "add this secret keyring to the list"
 msgstr "aЯade este anillo secreto a la lista"
 
-#: g10/g10.c:247
+#: g10/g10.c:254
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: g10/g10.c:248
+#: g10/g10.c:255
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVIDOR|usa este servidor de claves"
 
-#: g10/g10.c:249
+#: g10/g10.c:256
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
 
-#: g10/g10.c:250
+#: g10/g10.c:257
 msgid "read options from file"
 msgstr "lee opciones del fichero"
 
-#: g10/g10.c:252
+#: g10/g10.c:259
 msgid "set debugging flags"
 msgstr "establece los parАmetros de depuraciСn"
 
-#: g10/g10.c:253
+#: g10/g10.c:260
 msgid "enable full debugging"
 msgstr "habilita depuraciСn completa"
 
-#: g10/g10.c:254
+#: g10/g10.c:261
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaciСn de estado en descriptor DF"
 
-#: g10/g10.c:255
+#: g10/g10.c:262
 msgid "do not write comment packets"
 msgstr "no escribe paquetes de comentario"
 
-#: g10/g10.c:256
+#: g10/g10.c:263
 msgid "(default is 1)"
 msgstr "(por defecto es 1)"
 
-#: g10/g10.c:257
+#: g10/g10.c:264
 msgid "(default is 3)"
 msgstr "(por defecto es 3)"
 
-#: g10/g10.c:259
+#: g10/g10.c:266
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHERO|carga mСdulo de extensiones FICHERO"
 
-#: g10/g10.c:260
+#: g10/g10.c:267
 msgid "emulate the mode described in RFC1991"
 msgstr "emula el modo descrito en la RFC1991"
 
-#: g10/g10.c:261
+#: g10/g10.c:268
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:262
+#: g10/g10.c:269
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa modo de contraseЯa N"
 
-#: g10/g10.c:264
+#: g10/g10.c:271
 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:266
+#: g10/g10.c:273
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las\n"
 "contraseЯas"
 
-#: g10/g10.c:267
+#: g10/g10.c:274
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 
-#: g10/g10.c:268
+#: g10/g10.c:275
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: g10/g10.c:269
+#: g10/g10.c:276
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa el algoritmo de compresiСn N"
 
-#: g10/g10.c:270
+#: g10/g10.c:277
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina el campo keyid de los paquetes cifrados"
 
-#: g10/g10.c:271
+#: g10/g10.c:278
 msgid "|NAME=VALUE|use this notation data"
 msgstr ""
 
-#: g10/g10.c:273
+#: g10/g10.c:280
 msgid ""
 "@\n"
 "Examples:\n"
@@ -602,15 +618,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/g10.c:353
+#: g10/g10.c:360
 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:357
+#: g10/g10.c:364
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/g10.c:360
+#: g10/g10.c:367
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -620,7 +636,7 @@ msgstr ""
 "Firma, comprueba, cifra o descifra.\n"
 "La operaciСn por defecto depende del tipo de datos de entrada.\n"
 
-#: g10/g10.c:365
+#: g10/g10.c:372
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -628,169 +644,181 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/g10.c:439
+#: g10/g10.c:446
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/g10.c:492
+#: g10/g10.c:499
 msgid "conflicting commands\n"
 msgstr "comandos incompatibles\n"
 
-#: g10/g10.c:626
+#: g10/g10.c:633
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:630
+#: g10/g10.c:637
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:637
+#: g10/g10.c:644
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:805
+#: g10/g10.c:824
 #, 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:852 g10/g10.c:864
+#: g10/g10.c:872 g10/g10.c:884
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado no es vАlido\n"
 
-#: g10/g10.c:858 g10/g10.c:870
+#: g10/g10.c:878 g10/g10.c:890
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no es vАlido\n"
 
-#: g10/g10.c:874
+#: g10/g10.c:894
 msgid "the given policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:877
+#: g10/g10.c:897
 #, 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:879
+#: g10/g10.c:899
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:881
+#: g10/g10.c:901
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:883
+#: g10/g10.c:903
 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:886
+#: g10/g10.c:906
 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:890
+#: g10/g10.c:910
 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:967
+#: g10/g10.c:987
 #, 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:973
+#: g10/g10.c:993
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:980
+#: g10/g10.c:1000
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:988
+#: g10/g10.c:1008
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:1001
+#: g10/g10.c:1021
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1034
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:1028
+#: g10/g10.c:1048
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:1040
+#: g10/g10.c:1060
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:1049
-msgid "--edit-key username [commands]"
+#: g10/g10.c:1068
+msgid "--sign-key user-id"
+msgstr ""
+
+#: g10/g10.c:1076
+#, fuzzy
+msgid "--lsign-key user-id"
+msgstr "--delete-key nombre_usuario"
+
+#: g10/g10.c:1084
+#, fuzzy
+msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nombre_usuario [comandos]"
 
-#: g10/g10.c:1063
-msgid "--delete-secret-key username"
+#: g10/g10.c:1100
+#, fuzzy
+msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key nombre_usuario"
 
-#: g10/g10.c:1066
-msgid "--delete-key username"
+#: g10/g10.c:1103
+#, fuzzy
+msgid "--delete-key user-id"
 msgstr "--delete-key nombre_usuario"
 
-#: g10/encode.c:231 g10/g10.c:1090 g10/sign.c:366
+#: g10/encode.c:231 g10/g10.c:1127 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: g10/g10.c:1101
+#: g10/g10.c:1138
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [id_usuario] [anillo]"
 
-#: g10/g10.c:1162
+#: g10/g10.c:1199
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaciСn de armadura fallida: %s\n"
 
-#: g10/g10.c:1170
+#: g10/g10.c:1207
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaciСn de armadura fallida: %s\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1275
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuciСn no vАlido `%s'\n"
 
-#: g10/g10.c:1317
+#: g10/g10.c:1356
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
-#: g10/g10.c:1321
+#: g10/g10.c:1360
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1324 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1363 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no puede abrirse `%s'\n"
 
-#: g10/g10.c:1493
+#: g10/g10.c:1532
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/g10.c:1499
+#: g10/g10.c:1538
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1505
+#: g10/g10.c:1544
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1513
+#: g10/g10.c:1552
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
@@ -869,7 +897,12 @@ msgstr ""
 "caracter \"quoted printable\" en la armadura - probablemente se usС\n"
 "un MTA defectuoso\n"
 
-#: g10/pkclist.c:137
+#. a string with valid answers
+#: g10/pkclist.c:140
+msgid "sSmMqQ"
+msgstr "iImMqQ"
+
+#: g10/pkclist.c:144
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -878,7 +911,7 @@ msgstr ""
 "No hay confianza definida para el propietario %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:147
+#: g10/pkclist.c:154
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -900,28 +933,23 @@ msgstr ""
 " 4 = Me fМo completamente\n"
 " i = Mostrar mАs informaciСn\n"
 
-#: g10/pkclist.c:156
+#: g10/pkclist.c:163
 msgid " m = back to the main menu\n"
 msgstr " m = volver al menЗ principal\n"
 
-#: g10/pkclist.c:158
+#: g10/pkclist.c:165
 msgid " q = quit\n"
 msgstr " q = salir\n"
 
-#. a string with valid answers
-#: g10/pkclist.c:163
-msgid "sSmMqQ"
-msgstr "iImMqQ"
-
-#: g10/pkclist.c:167
+#: g10/pkclist.c:171
 msgid "Your decision? "
 msgstr "Su decisiСn: "
 
-#: g10/pkclist.c:187
+#: g10/pkclist.c:193
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que llevan a una clave de confianza absoluta:\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:264
 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"
@@ -931,7 +959,7 @@ msgstr ""
 "si es posible asignar algunos valores de confianza perdidos.\n"
 "\n"
 
-#: g10/pkclist.c:262
+#: g10/pkclist.c:270
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
@@ -939,7 +967,7 @@ msgstr ""
 "No se ha encontrado ninguna ruta con una de nuestras claves.\n"
 "\n"
 
-#: g10/pkclist.c:264
+#: g10/pkclist.c:272
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
@@ -947,7 +975,7 @@ msgstr ""
 "No se ha encontrado ningЗn certificado sin valor de confianza.\n"
 "\n"
 
-#: g10/pkclist.c:266
+#: g10/pkclist.c:274
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -955,36 +983,36 @@ msgstr ""
 "No se cambiС ningЗn valor de confianza.\n"
 "\n"
 
-#: g10/pkclist.c:283
+#: g10/pkclist.c:291
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "clave %08lX: ║esta clave ha sido revocada!\n"
 
-#: g10/pkclist.c:289 g10/pkclist.c:299 g10/pkclist.c:405
+#: g10/pkclist.c:297 g10/pkclist.c:307 g10/pkclist.c:413
 msgid "Use this key anyway? "
 msgstr "©Usar esta clave de todas formas? "
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:301
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "clave %08lX: ║esta subclave ha sido revocada!\n"
 
-#: g10/pkclist.c:323
+#: g10/pkclist.c:331
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: clave caducada\n"
 
-#: g10/pkclist.c:329
+#: g10/pkclist.c:337
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr "%08lX: no hay informaciСn para calcular la probabilidad de confianza\n"
 
-#: g10/pkclist.c:343
+#: g10/pkclist.c:351
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: ║Esta clave NO es de confianza!\n"
 
-#: g10/pkclist.c:349
+#: g10/pkclist.c:357
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -994,15 +1022,15 @@ msgstr ""
 "proprietario\n"
 "pero se acepta igualmente\n"
 
-#: g10/pkclist.c:355
+#: g10/pkclist.c:363
 msgid "This key probably belongs to the owner\n"
 msgstr "Esta clave probablemente pertenece a su proprietario\n"
 
-#: g10/pkclist.c:360
+#: g10/pkclist.c:368
 msgid "This key belongs to us\n"
 msgstr "Esta clave nos pertenece\n"
 
-#: g10/pkclist.c:400
+#: g10/pkclist.c:408
 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"
@@ -1014,66 +1042,66 @@ msgstr ""
 "\"sМ\" a la siguiente pregunta.\n"
 "\n"
 
-#: g10/pkclist.c:413 g10/pkclist.c:435
+#: g10/pkclist.c:421 g10/pkclist.c:443
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATENCIсN: ║Usando una clave no fiable!\n"
 
-#: g10/pkclist.c:456
+#: g10/pkclist.c:464
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATENCIсN: ║Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:465
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "          Esto puede significar que la firma estА falsificada.\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:469
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATENCIсN: ║Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/pkclist.c:482
+#: g10/pkclist.c:490
 msgid "Note: This key has expired!\n"
 msgstr "Nota: ║Esta clave estА caducada!\n"
 
-#: g10/pkclist.c:489
+#: g10/pkclist.c:497
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ATENCIсN: ║Esta clave no estА certificada por una firma de confianza!\n"
 
-#: g10/pkclist.c:491
+#: g10/pkclist.c:499
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         No hay indicios de que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:507
+#: g10/pkclist.c:515
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATENCIсN: ║Esta clave NO es de confianza!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:516
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         La firma es probablemente una FALSIFICACIсN.\n"
 
-#: g10/pkclist.c:515
+#: g10/pkclist.c:523
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATENCIсN: ║Esta clave no estА certificada con suficientes firmas de "
 "confianza!\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:526
 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:582 g10/pkclist.c:604 g10/pkclist.c:670 g10/pkclist.c:715
+#: g10/pkclist.c:627 g10/pkclist.c:649 g10/pkclist.c:758 g10/pkclist.c:803
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:590 g10/pkclist.c:697
+#: g10/pkclist.c:635 g10/pkclist.c:785
 #, fuzzy, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: problema lectura del bloque de clave: %s\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:662
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1081,30 +1109,34 @@ msgstr ""
 "No se ha especificado un ID de usuario (puede usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:618
+#: g10/pkclist.c:672
 msgid "Enter the user ID: "
 msgstr "Introduzca el ID de usuario: "
 
-#: g10/pkclist.c:629
+#: g10/pkclist.c:684
 msgid "No such user ID.\n"
 msgstr "ID de usuario inexistente.\n"
 
-#: g10/pkclist.c:639
+#: g10/pkclist.c:704
 #, fuzzy
 msgid "Public key is disabled.\n"
 msgstr "la clave pЗblica es %08lX\n"
 
-#: g10/pkclist.c:678
+#: g10/pkclist.c:733
+msgid "unknown default recipient `s'\n"
+msgstr ""
+
+#: g10/pkclist.c:766
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: error comprobando la clave: %s\n"
 
-#: g10/pkclist.c:683
+#: g10/pkclist.c:771
 #, fuzzy, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: problema lectura del bloque de clave: %s\n"
 
-#: g10/pkclist.c:721
+#: g10/pkclist.c:809
 msgid "no valid addressees\n"
 msgstr "no hay direcciones vАlidas\n"
 
@@ -1498,238 +1530,238 @@ msgstr "demasiados registros en la cache unk - anulada\n"
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n"
 
-#: g10/import.c:116
+#: g10/import.c:117
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: g10/import.c:160
+#: g10/import.c:161
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloque de tipo %d\n"
 
-#: g10/import.c:167 g10/trustdb.c:1658 g10/trustdb.c:1697
+#: g10/import.c:168 g10/trustdb.c:1658 g10/trustdb.c:1697
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "hasta ahora se han procesado %lu claves\n"
 
-#: g10/import.c:172
+#: g10/import.c:173
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/import.c:175
+#: g10/import.c:176
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "   Cantidad total procesada: %lu\n"
 
-#: g10/import.c:177
+#: g10/import.c:178
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         sin identificativo: %lu\n"
 
-#: g10/import.c:179
+#: g10/import.c:180
 #, c-format
 msgid "              imported: %lu"
 msgstr "                 importadas: %lu"
 
-#: g10/import.c:185
+#: g10/import.c:186
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                sin cambios: %lu\n"
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "     nuevos identificativos: %lu\n"
 
-#: g10/import.c:189
+#: g10/import.c:190
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nuevas subclaves: %lu\n"
 
-#: g10/import.c:191
+#: g10/import.c:192
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              nuevas firmas: %lu\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "        nuevas revocaciones: %lu\n"
 
-#: g10/import.c:195
+#: g10/import.c:196
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     claves secretas leМdas: %lu\n"
 
-#: g10/import.c:197
+#: g10/import.c:198
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " claves secretas importadas: %lu\n"
 
-#: g10/import.c:199
+#: g10/import.c:200
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claves secretas sin cambios: %lu\n"
 
-#: g10/import.c:342 g10/import.c:526
+#: g10/import.c:361 g10/import.c:550
 #, c-format
 msgid "key %08lX: no user id\n"
 msgstr "clave %08lX: no hay identificativo de usuario\n"
 
-#: g10/import.c:353
+#: g10/import.c:372
 #, c-format
 msgid "key %08lX: no valid user ids\n"
 msgstr "clave %08lX: no hay identificativos de usuario vАlidos\n"
 
-#: g10/import.c:355
+#: g10/import.c:374
 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:366 g10/import.c:593
+#: g10/import.c:385 g10/import.c:617
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "clave %08lX: clave pЗblica no encontrada: %s\n"
 
-#: g10/import.c:372
+#: g10/import.c:391
 msgid "no default public keyring\n"
 msgstr "no hay anillo pЗblico por defecto\n"
 
-#: g10/import.c:376 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
+#: g10/import.c:395 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
-#: g10/import.c:379 g10/import.c:432 g10/import.c:541 g10/import.c:642
+#: g10/import.c:398 g10/import.c:456 g10/import.c:565 g10/import.c:666
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "no puede bloquearse el anillo `%s': %s\n"
 
-#: g10/import.c:382 g10/import.c:435 g10/import.c:544 g10/import.c:645
+#: g10/import.c:401 g10/import.c:459 g10/import.c:568 g10/import.c:669
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/import.c:387
+#: g10/import.c:406
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "clave %08lX: clave pЗblica importada\n"
 
-#: g10/import.c:399
+#: g10/import.c:423
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "clave %08lX: no se corresponde con nuestra copia\n"
 
-#: g10/import.c:408 g10/import.c:601
+#: g10/import.c:432 g10/import.c:625
 #, 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:414 g10/import.c:607
+#: g10/import.c:438 g10/import.c:631
 #, 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:441
+#: g10/import.c:465
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
 msgstr "clave %08lX: 1 nuevo identificativo de usuario\n"
 
-#: g10/import.c:444
+#: g10/import.c:468
 #, c-format
 msgid "key %08lX: %d new user-ids\n"
 msgstr "clave %08lX: %d nuevos identificativos de usuario\n"
 
-#: g10/import.c:447
+#: g10/import.c:471
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "clave %08lX: 1 nueva firma\n"
 
-#: g10/import.c:450
+#: g10/import.c:474
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "clave %08lX: %d nuevas firmas\n"
 
-#: g10/import.c:453
+#: g10/import.c:477
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "clave %08lX: 1 nueva subclave\n"
 
-#: g10/import.c:456
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "clave %08lX: %d nuevas subclaves\n"
 
-#: g10/import.c:466
+#: g10/import.c:490
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "clave %08lX: sin cambios\n"
 
-#: g10/import.c:549
+#: g10/import.c:573
 #, 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:553
+#: g10/import.c:577
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "clave %08lX: ya estaba en el anillo secreto\n"
 
-#: g10/import.c:558
+#: g10/import.c:582
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "clave %08lX: clave secreta no encontrada: %s\n"
 
-#: g10/import.c:587
+#: g10/import.c:611
 #, 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:618
+#: g10/import.c:642
 #, 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:650
+#: g10/import.c:674
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "clave %08lX: certificado de revocaciСn importado\n"
 
-#: g10/import.c:683
+#: g10/import.c:707
 #, 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:690 g10/import.c:714
+#: g10/import.c:714 g10/import.c:738
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "clave %08lX: algoritmo de clave pЗblica no soportado\n"
 
-#: g10/import.c:691
+#: g10/import.c:715
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "clave %08lX: autofirma no vАlida\n"
 
-#: g10/import.c:706
+#: g10/import.c:730
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "clave %08lX: no hay subclave para unir\n"
 
-#: g10/import.c:715
+#: g10/import.c:739
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "clave %08lX.%lu: uniСn de subclave no vАlida\n"
 
-#: g10/import.c:747
+#: g10/import.c:771
 #, c-format
 msgid "key %08lX: skipped userid '"
 msgstr "clave %08lX: ignorado identificativo de usuario '"
 
-#: g10/import.c:770
+#: g10/import.c:794
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "clave %08lX: subclave ignorada\n"
@@ -1738,33 +1770,33 @@ msgstr "clave %08lX: subclave ignorada\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:795
+#: g10/import.c:819
 #, 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:804
+#: g10/import.c:828
 #, 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:812
+#: g10/import.c:836
 #, 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:912
+#: g10/import.c:936
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "clave %08lX: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:963
+#: g10/import.c:987
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "clave %08lX: certificado de revocaciСn aЯadido\n"
 
-#: g10/import.c:1076 g10/import.c:1131
+#: g10/import.c:1100 g10/import.c:1155
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "clave %08lX: nuestra copia no tiene autofirma\n"
@@ -1850,7 +1882,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "©Firmar de verdad? "
 
-#: g10/keyedit.c:370 g10/keyedit.c:1806 g10/keyedit.c:1855 g10/sign.c:128
+#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:128
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
@@ -1892,394 +1924,394 @@ msgstr "©Realmente quiere hacer esto? "
 msgid "moving a key signature to the correct place\n"
 msgstr "moviendo la firma de la clave al lugar correcto\n"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:564
 msgid "quit this menu"
 msgstr "sale de este menЗ"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:565
 msgid "q"
 msgstr ""
 
-#: g10/keyedit.c:563
+#: g10/keyedit.c:566
 msgid "save"
 msgstr ""
 
-#: g10/keyedit.c:563
+#: g10/keyedit.c:566
 msgid "save and quit"
 msgstr "graba y sale"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:567
 msgid "help"
 msgstr ""
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:567
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:569
 msgid "fpr"
 msgstr ""
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:569
 msgid "show fingerprint"
 msgstr "muestra huella dactilar"
 
-#: g10/keyedit.c:567
+#: g10/keyedit.c:570
 msgid "list"
 msgstr ""
 
-#: g10/keyedit.c:567
+#: g10/keyedit.c:570
 msgid "list key and user ids"
 msgstr "lista clave e identificativos de usuario"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:571
 msgid "l"
 msgstr ""
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:572
 msgid "uid"
 msgstr ""
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:572
 msgid "select user id N"
 msgstr "selecciona identificativo de usuario N"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:573
 msgid "key"
 msgstr ""
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:573
 msgid "select secondary key N"
 msgstr "selecciona clave secundaria N"
 
-#: g10/keyedit.c:571
+#: g10/keyedit.c:574
 msgid "check"
 msgstr ""
 
-#: g10/keyedit.c:571
+#: g10/keyedit.c:574
 msgid "list signatures"
 msgstr "lista firmas"
 
-#: g10/keyedit.c:572
+#: g10/keyedit.c:575
 msgid "c"
 msgstr ""
 
-#: g10/keyedit.c:573
+#: g10/keyedit.c:576
 msgid "sign"
 msgstr ""
 
-#: g10/keyedit.c:573
+#: g10/keyedit.c:576
 msgid "sign the key"
 msgstr "firma la clave"
 
-#: g10/keyedit.c:574
+#: g10/keyedit.c:577
 msgid "s"
 msgstr ""
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:578
 #, fuzzy
 msgid "lsign"
 msgstr "firmando:"
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:578
 msgid "sign the key locally"
 msgstr "firma la clave localmente"
 
-#: g10/keyedit.c:576
+#: g10/keyedit.c:579
 msgid "debug"
 msgstr ""
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:580
 msgid "adduid"
 msgstr ""
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:580
 msgid "add a user id"
 msgstr "aЯade un identificativo de usuario"
 
-#: g10/keyedit.c:578
+#: g10/keyedit.c:581
 msgid "deluid"
 msgstr ""
 
-#: g10/keyedit.c:578
+#: g10/keyedit.c:581
 msgid "delete user id"
 msgstr "borra un identificativo de usuario"
 
-#: g10/keyedit.c:579
+#: g10/keyedit.c:582
 msgid "addkey"
 msgstr ""
 
-#: g10/keyedit.c:579
+#: g10/keyedit.c:582
 msgid "add a secondary key"
 msgstr "aЯade una clave secundaria"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:583
 msgid "delkey"
 msgstr ""
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:583
 msgid "delete a secondary key"
 msgstr "borra una clave secundaria"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:584
 #, fuzzy
 msgid "delsig"
 msgstr "firmando:"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:584
 #, fuzzy
 msgid "delete signatures"
 msgstr "lista firmas"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:585
 msgid "expire"
 msgstr ""
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:585
 msgid "change the expire date"
 msgstr "cambia fecha de caducidad"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:586
 msgid "toggle"
 msgstr ""
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:586
 msgid "toggle between secret and public key listing"
 msgstr "cambia entre lista de claves secretas y pЗblicas"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:588
 msgid "t"
 msgstr ""
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:589
 msgid "pref"
 msgstr ""
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:589
 msgid "list preferences"
 msgstr "muestra preferencias"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:590
 msgid "passwd"
 msgstr ""
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:590
 msgid "change the passphrase"
 msgstr "cambia la contraseЯa"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 msgid "trust"
 msgstr ""
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:592
 msgid "revsig"
 msgstr ""
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:592
 msgid "revoke signatures"
 msgstr "revoca firmas"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:593
 msgid "revkey"
 msgstr ""
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:593
 msgid "revoke a secondary key"
 msgstr "revoca una clave secundaria"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:594
 msgid "disable"
 msgstr ""
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:594
 #, fuzzy
 msgid "disable a key"
 msgstr "Clave incorrecta"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:595
 msgid "enable"
 msgstr ""
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:595
 #, fuzzy
 msgid "enable a key"
 msgstr "Clave incorrecta"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:614
 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:640
+#. fixme: check that they both match
+#: g10/keyedit.c:652
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:681
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:711
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto.\n"
 
-#: g10/keyedit.c:718
-msgid "Save changes? "
-msgstr "©Grabar cambios? "
-
-#: g10/keyedit.c:721
-msgid "Quit without saving? "
-msgstr "©Salir sin grabar? "
-
-#: g10/keyedit.c:731
-#, c-format
-msgid "update failed: %s\n"
-msgstr "actualizaciСn fallida: %s\n"
-
-#: g10/keyedit.c:738
-#, c-format
-msgid "update secret failed: %s\n"
-msgstr "actualizaciСn de la clave secreta fallida: %s\n"
-
-#: g10/keyedit.c:745
-msgid "Key not changed so no update needed.\n"
-msgstr "Clave sin cambios, no se necesita actualizaciСn.\n"
-
-#: g10/keyedit.c:748 g10/keyedit.c:807
-#, c-format
-msgid "update of trustdb failed: %s\n"
-msgstr "actualizaciСn de confianza fallida: %s\n"
-
-#: g10/keyedit.c:781
+#: g10/keyedit.c:758
 msgid "Really sign all user ids? "
 msgstr "©Firmar realmente todos los identificativos de usuario? "
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:759
 msgid "Hint: Select the user ids to sign\n"
 msgstr "Sugerencia: seleccione los identificativos de usuario a firmar\n"
 
-#: g10/keyedit.c:818 g10/keyedit.c:839
+#: g10/keyedit.c:786 g10/keyedit.c:968
+#, c-format
+msgid "update of trustdb failed: %s\n"
+msgstr "actualizaciСn de confianza fallida: %s\n"
+
+#: g10/keyedit.c:797 g10/keyedit.c:818
 msgid "You must select at least one user id.\n"
 msgstr "Debe seleccionar por lo menos un identificativo de usuario.\n"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:799
 msgid "You can't delete the last user id!\n"
 msgstr "║No puede borrar el Зltimo identificativo de usuario!\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:802
 msgid "Really remove all selected user ids? "
 msgstr "©Borrar realmente todos los identificativos seleccionados? "
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:803
 msgid "Really remove this user id? "
 msgstr "©Borrar realmente este identificativo? "
 
-#: g10/keyedit.c:860 g10/keyedit.c:882
+#: g10/keyedit.c:839 g10/keyedit.c:861
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:864
+#: g10/keyedit.c:843
 msgid "Do you really want to delete the selected keys? "
 msgstr "©Borrar realmente las claves seleccionadas? "
 
-#: g10/keyedit.c:865
+#: g10/keyedit.c:844
 msgid "Do you really want to delete this key? "
 msgstr "©Borrar realmente esta clave? "
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:865
 msgid "Do you really want to revoke the selected keys? "
 msgstr "©Revocar realmente las claves seleccionadas? "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:866
 msgid "Do you really want to revoke this key? "
 msgstr "©Revocar realmente esta clave? "
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:932
+msgid "Save changes? "
+msgstr "©Grabar cambios? "
+
+#: g10/keyedit.c:935
+msgid "Quit without saving? "
+msgstr "©Salir sin grabar? "
+
+#: g10/keyedit.c:946
+#, c-format
+msgid "update failed: %s\n"
+msgstr "actualizaciСn fallida: %s\n"
+
+#: g10/keyedit.c:953
+#, c-format
+msgid "update secret failed: %s\n"
+msgstr "actualizaciСn de la clave secreta fallida: %s\n"
+
+#: g10/keyedit.c:960
+msgid "Key not changed so no update needed.\n"
+msgstr "Clave sin cambios, no se necesita actualizaciСn.\n"
+
+#: g10/keyedit.c:975
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando no vАlido (pruebe \"help\")\n"
 
-#: g10/keyedit.c:1039
+#: g10/keyedit.c:1065
 #, fuzzy
 msgid "This key has been disabled"
 msgstr "Nota: ║Esta clave estА caducada!\n"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1336
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1340
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1344
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1350
 #, fuzzy
 msgid "Really delete this self-signature? (y/N)"
 msgstr "©Crear los certificados de revocaciСn realmente? (s/N)"
 
-#: g10/keyedit.c:1338
+#: g10/keyedit.c:1364
 #, fuzzy, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas incorrectas\n"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1365
 #, fuzzy, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas incorrectas\n"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1368
 #, fuzzy
 msgid "Nothing deleted.\n"
 msgstr "ATENCIсN: no se ha exportado nada\n"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1437
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite la selecciСn de las claves secretas.\n"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1443
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como mАximo una clave secundaria.\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambiando caducidad de clave secundaria.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1449
 #, fuzzy
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:1464
+#: g10/keyedit.c:1490
 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:1480
+#: g10/keyedit.c:1506
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hay firma correspondiente en anillo secreto\n"
 
-#: g10/keyedit.c:1540
+#: g10/keyedit.c:1566
 #, 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:1586
+#: g10/keyedit.c:1612
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No hay ninguna clave secundaria con el Мndice %d\n"
 
-#: g10/keyedit.c:1684
+#: g10/keyedit.c:1710
 msgid "user ID: \""
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:1687
+#: g10/keyedit.c:1713
 #, c-format
 msgid ""
 "\"\n"
@@ -2288,15 +2320,15 @@ msgstr ""
 "\"\n"
 "firmada con su clave %08lX el %s\n"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1717
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "©Crear un certificado de revocaciСn para esta clave (s/N)?"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1797
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "©Crear los certificados de revocaciСn realmente? (s/N)"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1820
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
@@ -3249,6 +3281,9 @@ msgstr "Ayuda no disponible"
 msgid "No help available for `%s'"
 msgstr "Ayuda no disponible para `%s'"
 
+#~ msgid "print all message digests"
+#~ msgstr "imprime todos los resЗmenes de mensaje"
+
 #~ msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n"
 #~ msgstr ""
 #~ "NOTA: el registro de firma %lu[%d] estА en la lista\n"
diff --git a/po/fr.po b/po/fr.po
index 161dd139f..33af86802 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 0.9.7\n"
-"POT-Creation-Date: 1999-07-12 15:04+0200\n"
+"POT-Creation-Date: 1999-07-14 11:47+0200\n"
 "PO-Revision-Date: 1999-05-24 21:48+02:00\n"
 "Last-Translator: GaКl QuИri <gqueri@mail.dotcom.fr>\n"
 "Language-Team: French <traduc@Linux.EU.ORG>\n"
@@ -35,7 +35,7 @@ msgstr "oui"
 msgid "yY"
 msgstr "oO"
 
-#: g10/keyedit.c:561 util/miscutil.c:272
+#: g10/keyedit.c:564 util/miscutil.c:272
 msgid "quit"
 msgstr "quitter"
 
@@ -276,7 +276,7 @@ msgstr ""
 "Il n'y a pas assez d'octets alИatoires disponibles. Faites autre chose\n"
 "pour que l'OS puisse amasser plus d'entropie ! (il faut %d octets de plus)\n"
 
-#: g10/g10.c:177
+#: g10/g10.c:180
 msgid ""
 "@Commands:\n"
 " "
@@ -284,132 +284,139 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/g10.c:179
+#: g10/g10.c:182
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/g10.c:180
+#: g10/g10.c:183
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/g10.c:181
+#: g10/g10.c:184
 msgid "make a detached signature"
 msgstr "faire une signature dИtachИe"
 
-#: g10/g10.c:182
+#: g10/g10.c:185
 msgid "encrypt data"
 msgstr "chiffrer les donnИes"
 
-#: g10/g10.c:183
+#: g10/g10.c:186
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement symИtrique seulement"
 
-#: g10/g10.c:184
+#: g10/g10.c:187
 msgid "store only"
 msgstr "pas d'action"
 
-#: g10/g10.c:185
+#: g10/g10.c:188
 msgid "decrypt data (default)"
 msgstr "dИchiffrer les donnИes (dИfaut)"
 
-#: g10/g10.c:186
+#: g10/g10.c:189
 msgid "verify a signature"
 msgstr "vИrifier une signature"
 
-#: g10/g10.c:187
+#: g10/g10.c:190
 msgid "list keys"
 msgstr "lister les clИs"
 
-#: g10/g10.c:189
+#: g10/g10.c:192
 msgid "list keys and signatures"
 msgstr "lister les clИs et les signatures"
 
-#: g10/g10.c:190
+#: g10/g10.c:193
 msgid "check key signatures"
 msgstr "vИrifier les signatures des clИs"
 
-#: g10/g10.c:191
+#: g10/g10.c:194
 msgid "list keys and fingerprints"
 msgstr "lister les clИs et les empreintes"
 
-#: g10/g10.c:192
+#: g10/g10.c:195
 msgid "list secret keys"
 msgstr "lister les clИs secrХtes"
 
-#: g10/g10.c:193
+#: g10/g10.c:196
 msgid "generate a new key pair"
 msgstr "gИnИrer une nouvelle paire de clИs"
 
-#: g10/g10.c:194
+#: g10/g10.c:197
 msgid "remove key from the public keyring"
 msgstr "enlever la clИ du porte-clИs public"
 
-#: g10/g10.c:195
+#: g10/g10.c:198
+#, fuzzy
+msgid "sign a key"
+msgstr "signer la clИ"
+
+#: g10/g10.c:199
+#, fuzzy
+msgid "sign a key locally"
+msgstr "signer la clИ localement"
+
+#: g10/g10.c:200
 msgid "sign or edit a key"
 msgstr "signer ou Иditer une clИ"
 
-#: g10/g10.c:196
+#: g10/g10.c:201
 msgid "generate a revocation certificate"
 msgstr "gИnИrer un certificat de rИvocation"
 
-#: g10/g10.c:197
+#: g10/g10.c:202
 msgid "export keys"
 msgstr "exporter les clИs"
 
-#: g10/g10.c:198
+#: g10/g10.c:203
 msgid "export keys to a key server"
 msgstr "exporter les clИs vers un serveur de clИs"
 
-#: g10/g10.c:199
+#: g10/g10.c:204
 msgid "import keys from a key server"
 msgstr "importer les clИs d'un serveur de clИs"
 
-#: g10/g10.c:202
+#: g10/g10.c:207
 msgid "import/merge keys"
 msgstr "importer/fusionner les clИs"
 
-#: g10/g10.c:204
+#: g10/g10.c:209
 msgid "list only the sequence of packets"
 msgstr "ne lister que les paquets"
 
-#: g10/g10.c:206
+#: g10/g10.c:211
 msgid "export the ownertrust values"
 msgstr "exporter les indices de confiance"
 
-#: g10/g10.c:208
+#: g10/g10.c:213
 msgid "import ownertrust values"
 msgstr "importer les indices de confiance"
 
 #
-#: g10/g10.c:210
-msgid "|[NAMES]|update the trust database"
+#: g10/g10.c:215
+#, fuzzy
+msgid "update the trust database"
 msgstr "|[NOMS]|mettre la base de confiance Ю jour"
 
-#: g10/g10.c:212
+#: g10/g10.c:217
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMS]|vИrifier la base de confiance"
 
-#: g10/g10.c:213
+#: g10/g10.c:218
 msgid "fix a corrupted trust database"
 msgstr "rИparer une base de confiance corrompue"
 
-#: g10/g10.c:214
+#: g10/g10.c:219
 msgid "De-Armor a file or stdin"
 msgstr "Enlever l'armure d'un fichier ou de stdin"
 
-#: g10/g10.c:215
+#: g10/g10.c:220
 msgid "En-Armor a file or stdin"
 msgstr "Mettre une armure Ю un fichier ou Ю stdin"
 
-#: g10/g10.c:216
+#: g10/g10.c:221
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/g10.c:217
-msgid "print all message digests"
-msgstr "Иcrire toutes les fonctions de hachage"
-
-#: g10/g10.c:223
+#: g10/g10.c:225
 msgid ""
 "@\n"
 "Options:\n"
@@ -419,162 +426,171 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/g10.c:225
+#: g10/g10.c:227
 msgid "create ascii armored output"
 msgstr "crИer une sortie ascii avec armure"
 
-#: g10/g10.c:226
+#: g10/g10.c:228
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
+#, fuzzy
+msgid "|NAME|use NAME as default recipient"
+msgstr "|NOM|utiliser NOM comme clИ secrХte par dИfaut"
+
+#: g10/g10.c:233
+msgid "use the default key as default recipient"
+msgstr ""
+
+#: g10/g10.c:237
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou dИchiffrer"
 
-#: g10/g10.c:231
+#: g10/g10.c:238
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 dИsactive)"
 
-#: g10/g10.c:233
+#: g10/g10.c:240
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/g10.c:234
+#: g10/g10.c:241
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/g10.c:235
+#: g10/g10.c:242
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/g10.c:236
+#: g10/g10.c:243
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: g10/g10.c:237
+#: g10/g10.c:244
 msgid "don't use the terminal at all"
 msgstr ""
 
 #
-#: g10/g10.c:238
+#: g10/g10.c:245
 msgid "force v3 signatures"
 msgstr "forcer les signatures en v3"
 
-#: g10/g10.c:239
+#: g10/g10.c:246
 msgid "always use a MDC for encryption"
 msgstr "toujours utiliser un sceau pour le chiffrement"
 
-#: g10/g10.c:240
+#: g10/g10.c:247
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:242
+#: g10/g10.c:249
 msgid "batch mode: never ask"
 msgstr "mode automatique : ne jamais rien demander"
 
-#: g10/g10.c:243
+#: g10/g10.c:250
 msgid "assume yes on most questions"
 msgstr "rИpondre oui Ю la plupart des questions"
 
-#: g10/g10.c:244
+#: g10/g10.c:251
 msgid "assume no on most questions"
 msgstr "rИpondre non Ю la plupart des questions"
 
-#: g10/g10.c:245
+#: g10/g10.c:252
 msgid "add this keyring to the list of keyrings"
 msgstr "ajouter ce porte-clИs Ю la liste des porte-clИs"
 
-#: g10/g10.c:246
+#: g10/g10.c:253
 msgid "add this secret keyring to the list"
 msgstr "ajouter ce porte-clИs secret Ю la liste"
 
-#: g10/g10.c:247
+#: g10/g10.c:254
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|utiliser NOM comme clИ secrХte par dИfaut"
 
-#: g10/g10.c:248
+#: g10/g10.c:255
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HтTE|utiliser ce serveur pour chercher des clИs"
 
-#: g10/g10.c:249
+#: g10/g10.c:256
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|le terminal utilise la table de caractХres NOM"
 
-#: g10/g10.c:250
+#: g10/g10.c:257
 msgid "read options from file"
 msgstr "lire les options du fichier"
 
-#: g10/g10.c:252
+#: g10/g10.c:259
 msgid "set debugging flags"
 msgstr "choisir les attributs de dИboguage"
 
-#: g10/g10.c:253
+#: g10/g10.c:260
 msgid "enable full debugging"
 msgstr "permettre un dИboguage complet"
 
-#: g10/g10.c:254
+#: g10/g10.c:261
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Иcrire l'Иtat sur ce descripteur"
 
-#: g10/g10.c:255
+#: g10/g10.c:262
 msgid "do not write comment packets"
 msgstr "ne pas Иcrire de paquets de commentaire"
 
-#: g10/g10.c:256
+#: g10/g10.c:263
 msgid "(default is 1)"
 msgstr "nombre de signatures complХtes requises (1)"
 
-#: g10/g10.c:257
+#: g10/g10.c:264
 msgid "(default is 3)"
 msgstr "nombre de signatures marginales requises (3)"
 
-#: g10/g10.c:259
+#: g10/g10.c:266
 msgid "|FILE|load extension module FILE"
 msgstr "|FICH|charger le module d'extension FICH"
 
-#: g10/g10.c:260
+#: g10/g10.c:267
 msgid "emulate the mode described in RFC1991"
 msgstr "imiter le mode dИcrit dans la RFC1991"
 
-#: g10/g10.c:261
+#: g10/g10.c:268
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 
 # FIXMOI : faudra trouver mieux ...
-#: g10/g10.c:262
+#: g10/g10.c:269
 msgid "|N|use passphrase mode N"
 msgstr "|N|utiliser le mode de codage des mots de passe N"
 
-#: g10/g10.c:264
+#: g10/g10.c:271
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
 
-#: g10/g10.c:266
+#: g10/g10.c:273
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
 
-#: g10/g10.c:267
+#: g10/g10.c:274
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
 
-#: g10/g10.c:268
+#: g10/g10.c:275
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|utiliser la fonction de hachage NOM"
 
-#: g10/g10.c:269
+#: g10/g10.c:276
 msgid "|N|use compress algorithm N"
 msgstr "|N|utiliser l'algorithme de compression N"
 
-#: g10/g10.c:270
+#: g10/g10.c:277
 msgid "throw keyid field of encrypted packets"
 msgstr "supprimer l'identification des paquets chiffrИs"
 
-#: g10/g10.c:271
+#: g10/g10.c:278
 msgid "|NAME=VALUE|use this notation data"
 msgstr ""
 
-#: g10/g10.c:273
+#: g10/g10.c:280
 msgid ""
 "@\n"
 "Examples:\n"
@@ -594,15 +610,15 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les clИs\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/g10.c:353
+#: g10/g10.c:360
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Rapporter toutes anomalies Ю <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:357
+#: g10/g10.c:364
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/g10.c:360
+#: g10/g10.c:367
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -612,7 +628,7 @@ msgstr ""
 "signer, vИrifier, chiffer ou dИchiffrer\n"
 "l'opИration par dИfaut dИpend des donnИes entrИes\n"
 
-#: g10/g10.c:365
+#: g10/g10.c:372
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -620,169 +636,181 @@ msgstr ""
 "\n"
 "Algorithmes supportИs:\n"
 
-#: g10/g10.c:439
+#: g10/g10.c:446
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/g10.c:492
+#: g10/g10.c:499
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/g10.c:626
+#: g10/g10.c:633
 #, 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:630
+#: g10/g10.c:637
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s' : %s\n"
 
-#: g10/g10.c:637
+#: g10/g10.c:644
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:805
+#: g10/g10.c:824
 #, 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:852 g10/g10.c:864
+#: g10/g10.c:872 g10/g10.c:884
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement sИlectionnИ est invalide\n"
 
-#: g10/g10.c:858 g10/g10.c:870
+#: g10/g10.c:878 g10/g10.c:890
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage sИlectionnИe est invalide\n"
 
-#: g10/g10.c:874
+#: g10/g10.c:894
 msgid "the given policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:877
+#: g10/g10.c:897
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "l'algorithme de compression doit faire partie de l'Иchelle %d..%d\n"
 
-#: g10/g10.c:879
+#: g10/g10.c:899
 msgid "completes-needed must be greater than 0\n"
 msgstr "╚ completes-needed ╩ doit Йtre supИrieur Ю 0\n"
 
-#: g10/g10.c:881
+#: g10/g10.c:901
 msgid "marginals-needed must be greater than 1\n"
 msgstr "╚ marginals-needed ╩ doit Йtre supИrieur Ю 1\n"
 
-#: g10/g10.c:883
+#: g10/g10.c:903
 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:886
+#: g10/g10.c:906
 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:890
+#: g10/g10.c:910
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide ; doit Йtre 0, 1 ou 3\n"
 
-#: g10/g10.c:967
+#: g10/g10.c:987
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "n'a pas pu initialiser la base de confiance : %s\n"
 
-#: g10/g10.c:973
+#: g10/g10.c:993
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:980
+#: g10/g10.c:1000
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:988
+#: g10/g10.c:1008
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:1001
+#: g10/g10.c:1021
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1034
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:1028
+#: g10/g10.c:1048
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:1040
+#: g10/g10.c:1060
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:1049
-msgid "--edit-key username [commands]"
+#: g10/g10.c:1068
+msgid "--sign-key user-id"
+msgstr ""
+
+#: g10/g10.c:1076
+#, fuzzy
+msgid "--lsign-key user-id"
+msgstr "--delete-key utilisateur"
+
+#: g10/g10.c:1084
+#, fuzzy
+msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/g10.c:1063
-msgid "--delete-secret-key username"
+#: g10/g10.c:1100
+#, fuzzy
+msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key utilisateur"
 
-#: g10/g10.c:1066
-msgid "--delete-key username"
+#: g10/g10.c:1103
+#, fuzzy
+msgid "--delete-key user-id"
 msgstr "--delete-key utilisateur"
 
-#: g10/encode.c:231 g10/g10.c:1090 g10/sign.c:366
+#: g10/encode.c:231 g10/g10.c:1127 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "ne peut ouvrir %s: %s\n"
 
-#: g10/g10.c:1101
+#: g10/g10.c:1138
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-clИs]"
 
-#: g10/g10.c:1162
+#: g10/g10.c:1199
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "suppression d'armure non rИussie : %s\n"
 
-#: g10/g10.c:1170
+#: g10/g10.c:1207
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "construction d'armure non rИussie : %s \n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1275
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:1317
+#: g10/g10.c:1356
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:1321
+#: g10/g10.c:1360
 msgid "Go ahead and type your message ...\n"
 msgstr "Continuez et tapez votre message...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1324 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1363 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne peut ouvrir `%s'\n"
 
-#: g10/g10.c:1493
+#: g10/g10.c:1532
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/g10.c:1499
+#: g10/g10.c:1538
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1505
+#: g10/g10.c:1544
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1513
+#: g10/g10.c:1552
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
@@ -861,7 +889,12 @@ msgstr ""
 "caractХre citИ-imprimable (quoted-printable) dans l'armure provenant\n"
 "certainement d'un agent de transfert de messages boguИ\n"
 
-#: g10/pkclist.c:137
+#. a string with valid answers
+#: g10/pkclist.c:140
+msgid "sSmMqQ"
+msgstr "sSmMqQ"
+
+#: g10/pkclist.c:144
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -870,7 +903,7 @@ msgstr ""
 "Pas de confiance dИfinie pour %lu :\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:147
+#: g10/pkclist.c:154
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -894,28 +927,23 @@ msgstr ""
 " 4 = je le crois totalement\n"
 " s = montrez-moi plus d'informations\n"
 
-#: g10/pkclist.c:156
+#: g10/pkclist.c:163
 msgid " m = back to the main menu\n"
 msgstr " m = retour au menu principal\n"
 
-#: g10/pkclist.c:158
+#: g10/pkclist.c:165
 msgid " q = quit\n"
 msgstr " q = quitter\n"
 
-#. a string with valid answers
-#: g10/pkclist.c:163
-msgid "sSmMqQ"
-msgstr "sSmMqQ"
-
-#: g10/pkclist.c:167
+#: g10/pkclist.c:171
 msgid "Your decision? "
 msgstr "Votre dИcision ? "
 
-#: g10/pkclist.c:187
+#: g10/pkclist.c:193
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificats conduisant vers une clИ Ю confiance ultime :\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:264
 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"
@@ -924,7 +952,7 @@ msgstr ""
 "N'a pas pu trouver un chemin de confiance valide jusqu'Ю la clИ. Voyons si\n"
 "nous ne pouvons pas assigner quelques indices de confiance manquants.\n"
 
-#: g10/pkclist.c:262
+#: g10/pkclist.c:270
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
@@ -932,7 +960,7 @@ msgstr ""
 "Aucun chemin menant vers une de nos clИs n'a ИtИ trouvИ.\n"
 "\n"
 
-#: g10/pkclist.c:264
+#: g10/pkclist.c:272
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
@@ -940,7 +968,7 @@ msgstr ""
 "Aucun certificat Ю confiance indИfinie n'a ИtИ trouvИ.\n"
 "\n"
 
-#: g10/pkclist.c:266
+#: g10/pkclist.c:274
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -948,36 +976,36 @@ msgstr ""
 "Pas d'indice de confiance changИ.\n"
 "\n"
 
-#: g10/pkclist.c:283
+#: g10/pkclist.c:291
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "clИ %08lX : la clИ a ИtИ rИvoquИe !\n"
 
-#: g10/pkclist.c:289 g10/pkclist.c:299 g10/pkclist.c:405
+#: g10/pkclist.c:297 g10/pkclist.c:307 g10/pkclist.c:413
 msgid "Use this key anyway? "
 msgstr "Utiliser cette clИ quand-mЙme ? "
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:301
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "clИ %08lX : la sous-clИ a ИtИ rИvoquИe !\n"
 
-#: g10/pkclist.c:323
+#: g10/pkclist.c:331
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX : la clИ a expirИ\n"
 
-#: g10/pkclist.c:329
+#: g10/pkclist.c:337
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr "%08lX : pas d'information pour calculer une probabilitИ de confiance\n"
 
-#: g10/pkclist.c:343
+#: g10/pkclist.c:351
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX : Nous ne faisons PAS confiance Ю cette clИ\n"
 
-#: g10/pkclist.c:349
+#: g10/pkclist.c:357
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -987,15 +1015,15 @@ msgstr ""
 "propriИtaire\n"
 "mais elle est quand mЙme acceptИe\n"
 
-#: g10/pkclist.c:355
+#: g10/pkclist.c:363
 msgid "This key probably belongs to the owner\n"
 msgstr "Cette clИ appartient probablement Ю son propriИtaire\n"
 
-#: g10/pkclist.c:360
+#: g10/pkclist.c:368
 msgid "This key belongs to us\n"
 msgstr "Cette clИ nous appartient\n"
 
-#: g10/pkclist.c:400
+#: g10/pkclist.c:408
 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"
@@ -1007,67 +1035,67 @@ msgstr ""
 "oui Ю la prochaine question\n"
 "\n"
 
-#: g10/pkclist.c:413 g10/pkclist.c:435
+#: g10/pkclist.c:421 g10/pkclist.c:443
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENTION : Utilisation d'une clИ sans confiance !\n"
 
-#: g10/pkclist.c:456
+#: g10/pkclist.c:464
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENTION : Cette clИ Ю ИtИ rИvoquИe par son propriИtaire !\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:465
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Cela pourrait signifier que la signature est fausse.\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:469
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATTENTION : Cette sous-clИ Ю ИtИ rИvoquИe par son propriИtaire !\n"
 
-#: g10/pkclist.c:482
+#: g10/pkclist.c:490
 msgid "Note: This key has expired!\n"
 msgstr "Note : Cette clИ a expirИ !\n"
 
-#: g10/pkclist.c:489
+#: g10/pkclist.c:497
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ATTENTION : Cette clИ n'est pas certifiИe avec une signature de confiance !\n"
 
-#: g10/pkclist.c:491
+#: g10/pkclist.c:499
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Rien ne dit que la signature appartient Ю son propriИtaire.\n"
 
-#: g10/pkclist.c:507
+#: g10/pkclist.c:515
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENTION : Nous ne faisons PAS confiance Ю cette clИ !\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:516
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         La signature est certainement FAUSSE.\n"
 
-#: g10/pkclist.c:515
+#: g10/pkclist.c:523
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENTION : Les signatures de cette clИ n'ont pas une confiance suffisante "
 "!\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:526
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "         Il n'est pas sШr que la signature appartient Ю son propriИtaire.\n"
 
-#: g10/pkclist.c:582 g10/pkclist.c:604 g10/pkclist.c:670 g10/pkclist.c:715
+#: g10/pkclist.c:627 g10/pkclist.c:649 g10/pkclist.c:758 g10/pkclist.c:803
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s : ignorИ : %s\n"
 
-#: g10/pkclist.c:590 g10/pkclist.c:697
+#: g10/pkclist.c:635 g10/pkclist.c:785
 #, fuzzy, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s : problХme de lecture du bloc de clИs : %s\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:662
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1076,30 +1104,34 @@ msgstr ""
 "\"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:618
+#: g10/pkclist.c:672
 msgid "Enter the user ID: "
 msgstr "Entrez le nom d'utilisateur : "
 
-#: g10/pkclist.c:629
+#: g10/pkclist.c:684
 msgid "No such user ID.\n"
 msgstr "Pas de tel utilisateur.\n"
 
-#: g10/pkclist.c:639
+#: g10/pkclist.c:704
 #, fuzzy
 msgid "Public key is disabled.\n"
 msgstr "la clИ publique est %08lX\n"
 
-#: g10/pkclist.c:678
+#: g10/pkclist.c:733
+msgid "unknown default recipient `s'\n"
+msgstr ""
+
+#: g10/pkclist.c:766
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s : erreur pendant la vИrification de la clИ : %s\n"
 
-#: g10/pkclist.c:683
+#: g10/pkclist.c:771
 #, fuzzy, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s : problХme de lecture du bloc de clИs : %s\n"
 
-#: g10/pkclist.c:721
+#: g10/pkclist.c:809
 msgid "no valid addressees\n"
 msgstr "pas de destinataire valide\n"
 
@@ -1494,238 +1526,238 @@ msgstr ""
 "utilisation de la clИ secondaire %08lX Ю la place de la clИ\n"
 "principale %08lX\n"
 
-#: g10/import.c:116
+#: g10/import.c:117
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
 
-#: g10/import.c:160
+#: g10/import.c:161
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ne prend pas en compte le bloc de type %d\n"
 
-#: g10/import.c:167 g10/trustdb.c:1658 g10/trustdb.c:1697
+#: g10/import.c:168 g10/trustdb.c:1658 g10/trustdb.c:1697
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu clИs traitИes jusqu'ici\n"
 
-#: g10/import.c:172
+#: g10/import.c:173
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erreur pendant la lecture de `%s' : %s\n"
 
-#: g10/import.c:175
+#: g10/import.c:176
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "       QuantitИ totale traitИe : %lu\n"
 
-#: g10/import.c:177
+#: g10/import.c:178
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        sans nom d'utilisateur : %lu\n"
 
-#: g10/import.c:179
+#: g10/import.c:180
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      importИe : %lu"
 
-#: g10/import.c:185
+#: g10/import.c:186
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                     inchangИe : %lu\n"
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "  nouveaux noms d'utilisateurs : %lu\n"
 
-#: g10/import.c:189
+#: g10/import.c:190
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nouvelles sous-clИs : %lu\n"
 
-#: g10/import.c:191
+#: g10/import.c:192
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "          nouvelles signatures : %lu\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " nouvelles rИvocations de clИs : %lu\n"
 
-#: g10/import.c:195
+#: g10/import.c:196
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "            clИs secrХtes lues : %lu\n"
 
-#: g10/import.c:197
+#: g10/import.c:198
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "       clИs secrХtes importИes : %lu\n"
 
-#: g10/import.c:199
+#: g10/import.c:200
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      clИs secrХtes inchangИes : %lu\n"
 
-#: g10/import.c:342 g10/import.c:526
+#: g10/import.c:361 g10/import.c:550
 #, c-format
 msgid "key %08lX: no user id\n"
 msgstr "clИ %08lX : pas de nom d'utilisateur\n"
 
-#: g10/import.c:353
+#: g10/import.c:372
 #, c-format
 msgid "key %08lX: no valid user ids\n"
 msgstr "clИ %08lX : pas de nom d'utilisateur valide\n"
 
-#: g10/import.c:355
+#: g10/import.c:374
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela peut provenir d'une auto-signature manquante\n"
 
-#: g10/import.c:366 g10/import.c:593
+#: g10/import.c:385 g10/import.c:617
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "clИ %08lX : clИ publique pas trouvИe: %s\n"
 
-#: g10/import.c:372
+#: g10/import.c:391
 msgid "no default public keyring\n"
 msgstr "pas de porte-clИs public par dИfaut\n"
 
-#: g10/import.c:376 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
+#: g10/import.c:395 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Иcriture de `%s'\n"
 
-#: g10/import.c:379 g10/import.c:432 g10/import.c:541 g10/import.c:642
+#: g10/import.c:398 g10/import.c:456 g10/import.c:565 g10/import.c:666
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "ne peut verrouiller le porte-clИs `%s' : %s\n"
 
-#: g10/import.c:382 g10/import.c:435 g10/import.c:544 g10/import.c:645
+#: g10/import.c:401 g10/import.c:459 g10/import.c:568 g10/import.c:669
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erreur durant l'Иcriture du porte-clИs `%s' : %s\n"
 
-#: g10/import.c:387
+#: g10/import.c:406
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "clИ %08lX : clИ publique importИe\n"
 
-#: g10/import.c:399
+#: g10/import.c:423
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "clИ %08lX : ne ressemble pas Ю notre copie\n"
 
-#: g10/import.c:408 g10/import.c:601
+#: g10/import.c:432 g10/import.c:625
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "clИ %08lX : ne peut trouver le bloc de clИs original : %s\n"
 
-#: g10/import.c:414 g10/import.c:607
+#: g10/import.c:438 g10/import.c:631
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "clИ %08lX : ne peut lire le bloc de clИs original : %s\n"
 
-#: g10/import.c:441
+#: g10/import.c:465
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
 msgstr "clИ %08lX : un nouvel utilisateur\n"
 
-#: g10/import.c:444
+#: g10/import.c:468
 #, c-format
 msgid "key %08lX: %d new user-ids\n"
 msgstr "clИ %08lX : %d nouveaux utilisateurs\n"
 
-#: g10/import.c:447
+#: g10/import.c:471
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "clИ %08lX : une nouvelle signature\n"
 
-#: g10/import.c:450
+#: g10/import.c:474
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "clИ %08lX : %d nouvelles signatures\n"
 
-#: g10/import.c:453
+#: g10/import.c:477
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "clИ %08lX : une nouvelle sous-clИ\n"
 
-#: g10/import.c:456
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "clИ %08lX : %d nouvelles sous-clИs\n"
 
-#: g10/import.c:466
+#: g10/import.c:490
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "clИ %08lX : n'a pas changИ\n"
 
-#: g10/import.c:549
+#: g10/import.c:573
 #, 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:553
+#: g10/import.c:577
 #, 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:558
+#: g10/import.c:582
 #, 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:587
+#: g10/import.c:611
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clИ %08lX : pas de clИ publique - ne peut appliquer le certificat de\n"
 "rИvocation\n"
 
-#: g10/import.c:618
+#: g10/import.c:642
 #, 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:650
+#: g10/import.c:674
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "clИ %08lX : certificat de rИvocation importИ\n"
 
-#: g10/import.c:683
+#: g10/import.c:707
 #, c-format
 msgid "key %08lX: no user-id for signature\n"
 msgstr "clИ %08lX : pas d'utilisateur pour la signature\n"
 
-#: g10/import.c:690 g10/import.c:714
+#: g10/import.c:714 g10/import.c:738
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "clИ %08lX : algorithme de clИ publique non supportИ\n"
 
-#: g10/import.c:691
+#: g10/import.c:715
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "clИ %08lX : auto-signature invalide\n"
 
-#: g10/import.c:706
+#: g10/import.c:730
 #, 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:715
+#: g10/import.c:739
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "clИ %08lX : liaison avec la sous-clИ invalide\n"
 
-#: g10/import.c:747
+#: g10/import.c:771
 #, c-format
 msgid "key %08lX: skipped userid '"
 msgstr "clИ %08lX : utilisateur non pris en compte '"
 
-#: g10/import.c:770
+#: g10/import.c:794
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "clИ %08lX : sous-clИ non prise en compte\n"
@@ -1734,32 +1766,32 @@ msgstr "clИ %08lX : sous-clИ non prise en compte\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:795
+#: g10/import.c:819
 #, 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:804
+#: g10/import.c:828
 #, 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:812
+#: g10/import.c:836
 #, 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:912
+#: g10/import.c:936
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "clИ %08lX: nom d'utilisateur doublon fusionnИ\n"
 
-#: g10/import.c:963
+#: g10/import.c:987
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "clИ %08lX : certificat de rИvocation ajoutИ\n"
 
-#: g10/import.c:1076 g10/import.c:1131
+#: g10/import.c:1100 g10/import.c:1155
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "clИ %08lX : notre copie n'a pas d'auto-signature\n"
@@ -1845,7 +1877,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Signer rИellement ? "
 
-#: g10/keyedit.c:370 g10/keyedit.c:1806 g10/keyedit.c:1855 g10/sign.c:128
+#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:128
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a ИchouИ : %s\n"
@@ -1886,397 +1918,397 @@ msgstr "Voulez-vous vraiment faire cela? "
 msgid "moving a key signature to the correct place\n"
 msgstr "replacer la signature d'une clИ Ю l'endroit correct\n"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:564
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:565
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:563
+#: g10/keyedit.c:566
 msgid "save"
 msgstr "enregistrer"
 
-#: g10/keyedit.c:563
+#: g10/keyedit.c:566
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
 # FIXMOI : si je mets aide Гa va demander de taper "aide"...
-#: g10/keyedit.c:564
+#: g10/keyedit.c:567
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:567
 msgid "show this help"
 msgstr "afficher cette aide"
 
 # g10/keyedit.c:556 ???
-#: g10/keyedit.c:566
+#: g10/keyedit.c:569
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:569
 msgid "show fingerprint"
 msgstr "afficher l'empreinte"
 
-#: g10/keyedit.c:567
+#: g10/keyedit.c:570
 msgid "list"
 msgstr "lister"
 
-#: g10/keyedit.c:567
+#: g10/keyedit.c:570
 msgid "list key and user ids"
 msgstr "lister la clИ et les noms d'utilisateurs"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:571
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:572
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:572
 msgid "select user id N"
 msgstr "sИlectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:573
 msgid "key"
 msgstr "clИ"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:573
 msgid "select secondary key N"
 msgstr "sИlectionner la clИ secondaire N"
 
-#: g10/keyedit.c:571
+#: g10/keyedit.c:574
 msgid "check"
 msgstr "vИrifier"
 
-#: g10/keyedit.c:571
+#: g10/keyedit.c:574
 msgid "list signatures"
 msgstr "lister les signatures"
 
-#: g10/keyedit.c:572
+#: g10/keyedit.c:575
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:573
+#: g10/keyedit.c:576
 msgid "sign"
 msgstr "signer"
 
-#: g10/keyedit.c:573
+#: g10/keyedit.c:576
 msgid "sign the key"
 msgstr "signer la clИ"
 
-#: g10/keyedit.c:574
+#: g10/keyedit.c:577
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:578
 msgid "lsign"
 msgstr "lsigner"
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:578
 msgid "sign the key locally"
 msgstr "signer la clИ localement"
 
-#: g10/keyedit.c:576
+#: g10/keyedit.c:579
 msgid "debug"
 msgstr "dИboguer"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:580
 msgid "adduid"
 msgstr "aj.ut"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:580
 msgid "add a user id"
 msgstr "ajouter un utilisateur"
 
-#: g10/keyedit.c:578
+#: g10/keyedit.c:581
 msgid "deluid"
 msgstr "suppr.ut"
 
-#: g10/keyedit.c:578
+#: g10/keyedit.c:581
 msgid "delete user id"
 msgstr "enlever un utilisateur"
 
-#: g10/keyedit.c:579
+#: g10/keyedit.c:582
 msgid "addkey"
 msgstr "aj.clИ"
 
-#: g10/keyedit.c:579
+#: g10/keyedit.c:582
 msgid "add a secondary key"
 msgstr "ajouter une clИ secondaire"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:583
 msgid "delkey"
 msgstr "suppr.clИ"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:583
 msgid "delete a secondary key"
 msgstr "enlever une clИ secondaire"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:584
 #, fuzzy
 msgid "delsig"
 msgstr "lsigner"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:584
 #, fuzzy
 msgid "delete signatures"
 msgstr "lister les signatures"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:585
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:585
 msgid "change the expire date"
 msgstr "changer la date d'expiration"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:586
 msgid "toggle"
 msgstr "changer"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:586
 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:585
+#: g10/keyedit.c:588
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:589
 msgid "pref"
 msgstr "prИf"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:589
 msgid "list preferences"
 msgstr "lister les prИfИrences"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:590
 msgid "passwd"
 msgstr "mot.pas"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:590
 msgid "change the passphrase"
 msgstr "changer le mot de passe"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 msgid "trust"
 msgstr "confi."
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 msgid "change the ownertrust"
 msgstr "changer la confiance"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:592
 msgid "revsig"
 msgstr "revsig"
 
 #
-#: g10/keyedit.c:589
+#: g10/keyedit.c:592
 msgid "revoke signatures"
 msgstr "rИvoquer les signatures"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:593
 msgid "revkey"
 msgstr "revclИ"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:593
 msgid "revoke a secondary key"
 msgstr "rИvoquer une clИ secondaire"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:594
 msgid "disable"
 msgstr ""
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:594
 #, fuzzy
 msgid "disable a key"
 msgstr "mauvaise clИ"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:595
 msgid "enable"
 msgstr ""
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:595
 #, fuzzy
 msgid "enable a key"
 msgstr "mauvaise clИ"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:614
 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:640
+#. fixme: check that they both match
+#: g10/keyedit.c:652
 msgid "Secret key is available.\n"
 msgstr "La clИ secrХte est disponible.\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:681
 msgid "Command> "
 msgstr "Commande> "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:711
 msgid "Need the secret key to do this.\n"
 msgstr "Il faut la clИ secrХte pour faire cela.\n"
 
-#: g10/keyedit.c:718
-msgid "Save changes? "
-msgstr "Enregistrer les changements? "
-
-#: g10/keyedit.c:721
-msgid "Quit without saving? "
-msgstr "Quitter sans enregistrer? "
-
-#: g10/keyedit.c:731
-#, c-format
-msgid "update failed: %s\n"
-msgstr "la mise Ю jour a ИchouИ : %s\n"
-
-#: g10/keyedit.c:738
-#, c-format
-msgid "update secret failed: %s\n"
-msgstr "la mise Ю jour de la clИ secrХte a ИchouИ : %s\n"
-
-#: g10/keyedit.c:745
-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:748 g10/keyedit.c:807
-#, 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:781
+#: g10/keyedit.c:758
 msgid "Really sign all user ids? "
 msgstr "Signer vraiment tous les utilisateurs ? "
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:759
 msgid "Hint: Select the user ids to sign\n"
 msgstr "Aide : SИlectionner les utilisateurs Ю signer\n"
 
-#: g10/keyedit.c:818 g10/keyedit.c:839
+#: g10/keyedit.c:786 g10/keyedit.c:968
+#, 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:797 g10/keyedit.c:818
 msgid "You must select at least one user id.\n"
 msgstr "Vous devez sИlectionner au moins un utilisateur.\n"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:799
 msgid "You can't delete the last user id!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:802
 msgid "Really remove all selected user ids? "
 msgstr "Enlever rИellement tous les utilisateurs sИlectionnИs ? "
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:803
 msgid "Really remove this user id? "
 msgstr "Enlever rИellement cet utilisateur ? "
 
-#: g10/keyedit.c:860 g10/keyedit.c:882
+#: g10/keyedit.c:839 g10/keyedit.c:861
 msgid "You must select at least one key.\n"
 msgstr "Vous devez sИlectionner au moins une clИ.\n"
 
-#: g10/keyedit.c:864
+#: g10/keyedit.c:843
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voulez-vous vraiment supprimer les clИs sИlectionnИes ? "
 
-#: g10/keyedit.c:865
+#: g10/keyedit.c:844
 msgid "Do you really want to delete this key? "
 msgstr "Voulez-vous vraiment supprimer cette clИ ? "
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:865
 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:887
+#: g10/keyedit.c:866
 msgid "Do you really want to revoke this key? "
 msgstr "Voulez-vous vraiment rИvoquer cette clИ ? "
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:932
+msgid "Save changes? "
+msgstr "Enregistrer les changements? "
+
+#: g10/keyedit.c:935
+msgid "Quit without saving? "
+msgstr "Quitter sans enregistrer? "
+
+#: g10/keyedit.c:946
+#, c-format
+msgid "update failed: %s\n"
+msgstr "la mise Ю jour a ИchouИ : %s\n"
+
+#: g10/keyedit.c:953
+#, c-format
+msgid "update secret failed: %s\n"
+msgstr "la mise Ю jour de la clИ secrХte a ИchouИ : %s\n"
+
+#: g10/keyedit.c:960
+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:975
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez ╚ help ╩)\n"
 
-#: g10/keyedit.c:1039
+#: g10/keyedit.c:1065
 #, fuzzy
 msgid "This key has been disabled"
 msgstr "Note : Cette clИ a expirИ !\n"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1336
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1340
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1344
 #, fuzzy
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Faut-il vraiment gИnИrer les certificats de rИvocation ? (o/N)"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1350
 #, fuzzy
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment gИnИrer les certificats de rИvocation ? (o/N)"
 
-#: g10/keyedit.c:1338
+#: g10/keyedit.c:1364
 #, fuzzy, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d mauvaises signatures\n"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1365
 #, fuzzy, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d mauvaises signatures\n"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1368
 #, fuzzy
 msgid "Nothing deleted.\n"
 msgstr "ATTENTION : rien n'a ИtИ exportИ\n"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1437
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les sИlections des clИs secrХtes.\n"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1443
 msgid "Please select at most one secondary key.\n"
 msgstr "Vous devez sИlectionner au plus une clИ secondaire.\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Changer la date d'expiration d'une clИ secondaire.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1449
 #, fuzzy
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la clИ principale.\n"
 
-#: g10/keyedit.c:1464
+#: g10/keyedit.c:1490
 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:1480
+#: g10/keyedit.c:1506
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-clИs secret\n"
 
-#: g10/keyedit.c:1540
+#: g10/keyedit.c:1566
 #, c-format
 msgid "No user id with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1612
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Pas de clИ secondaire avec l'index %d\n"
 
-#: g10/keyedit.c:1684
+#: g10/keyedit.c:1710
 msgid "user ID: \""
 msgstr "nom d'utilisateur : ╚ "
 
-#: g10/keyedit.c:1687
+#: g10/keyedit.c:1713
 #, c-format
 msgid ""
 "\"\n"
@@ -2285,15 +2317,15 @@ msgstr ""
 " ╩\n"
 "signИ avec votre clИ %08lX Ю %s\n"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1717
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "GИnИrer un certificat de rИvocation pour cette signature ? (o/N)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1797
 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:1794
+#: g10/keyedit.c:1820
 msgid "no secret key\n"
 msgstr "pas de clИ secrХte\n"
 
@@ -3305,6 +3337,9 @@ msgstr "Pas d'aide disponible"
 msgid "No help available for `%s'"
 msgstr "Pas d'aide disponible pour `%s'"
 
+#~ msgid "print all message digests"
+#~ msgstr "Иcrire toutes les fonctions de hachage"
+
 #~ msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n"
 #~ msgstr ""
 #~ "NOTE : l'enregistrement de signature %lu[%d] est dans la liste d'aide\n"
diff --git a/po/it.po b/po/it.po
index 125b19609..2d8a09ecc 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-0.9.7\n"
-"POT-Creation-Date: 1999-07-12 15:04+0200\n"
+"POT-Creation-Date: 1999-07-14 11:47+0200\n"
 "PO-Revision-Date: 1999-06-28 19:49+02:00\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -33,7 +33,7 @@ msgstr "sЛ"
 msgid "yY"
 msgstr "sS"
 
-#: g10/keyedit.c:561 util/miscutil.c:272
+#: g10/keyedit.c:564 util/miscutil.c:272
 msgid "quit"
 msgstr "quit"
 
@@ -271,7 +271,7 @@ msgstr ""
 "altra cosa per dare all'OS la possibilitЮ di raccogliere altra entropia!\n"
 "(Servono ancora %d altri byte)\n"
 
-#: g10/g10.c:177
+#: g10/g10.c:180
 msgid ""
 "@Commands:\n"
 " "
@@ -279,131 +279,138 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/g10.c:179
+#: g10/g10.c:182
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/g10.c:180
+#: g10/g10.c:183
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/g10.c:181
+#: g10/g10.c:184
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/g10.c:182
+#: g10/g10.c:185
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/g10.c:183
+#: g10/g10.c:186
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/g10.c:184
+#: g10/g10.c:187
 msgid "store only"
 msgstr "immagazzina soltanto"
 
-#: g10/g10.c:185
+#: g10/g10.c:188
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/g10.c:186
+#: g10/g10.c:189
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:187
+#: g10/g10.c:190
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/g10.c:189
+#: g10/g10.c:192
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/g10.c:190
+#: g10/g10.c:193
 msgid "check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/g10.c:191
+#: g10/g10.c:194
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/g10.c:192
+#: g10/g10.c:195
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/g10.c:193
+#: g10/g10.c:196
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/g10.c:194
+#: g10/g10.c:197
 msgid "remove key from the public keyring"
 msgstr "rimuove una chiave dal portachiavi pubblico"
 
-#: g10/g10.c:195
+#: g10/g10.c:198
+#, fuzzy
+msgid "sign a key"
+msgstr "firma la chiave"
+
+#: g10/g10.c:199
+#, fuzzy
+msgid "sign a key locally"
+msgstr "firma la chiave localmente"
+
+#: g10/g10.c:200
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/g10.c:196
+#: g10/g10.c:201
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/g10.c:197
+#: g10/g10.c:202
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/g10.c:198
+#: g10/g10.c:203
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/g10.c:199
+#: g10/g10.c:204
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/g10.c:202
+#: g10/g10.c:207
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/g10.c:204
+#: g10/g10.c:209
 msgid "list only the sequence of packets"
 msgstr "elenca solo la sequenza dei pacchetti"
 
-#: g10/g10.c:206
+#: g10/g10.c:211
 msgid "export the ownertrust values"
 msgstr "esporta i valori di fiducia"
 
-#: g10/g10.c:208
+#: g10/g10.c:213
 msgid "import ownertrust values"
 msgstr "importa i valori di fiducia"
 
-#: g10/g10.c:210
-msgid "|[NAMES]|update the trust database"
+#: g10/g10.c:215
+#, fuzzy
+msgid "update the trust database"
 msgstr "|[NOMI]|controlla il database della fiducia"
 
-#: g10/g10.c:212
+#: g10/g10.c:217
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMI]|controlla il database della fiducia"
 
-#: g10/g10.c:213
+#: g10/g10.c:218
 msgid "fix a corrupted trust database"
 msgstr "ripara un database della fiducia rovinato"
 
-#: g10/g10.c:214
+#: g10/g10.c:219
 msgid "De-Armor a file or stdin"
 msgstr "rimuovi l'armatura a un file o a stdin"
 
-#: g10/g10.c:215
+#: g10/g10.c:220
 msgid "En-Armor a file or stdin"
 msgstr "crea l'armatura a un file o a stdin"
 
-#: g10/g10.c:216
+#: g10/g10.c:221
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/g10.c:217
-msgid "print all message digests"
-msgstr "stampa tutti i message digests"
-
-#: g10/g10.c:223
+#: g10/g10.c:225
 msgid ""
 "@\n"
 "Options:\n"
@@ -413,160 +420,169 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/g10.c:225
+#: g10/g10.c:227
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/g10.c:226
+#: g10/g10.c:228
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
+#, fuzzy
+msgid "|NAME|use NAME as default recipient"
+msgstr "|NAME|usa NAME come chiave segreta predefinita"
+
+#: g10/g10.c:233
+msgid "use the default key as default recipient"
+msgstr ""
+
+#: g10/g10.c:237
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/g10.c:231
+#: g10/g10.c:238
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disabilita)"
 
-#: g10/g10.c:233
+#: g10/g10.c:240
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/g10.c:234
+#: g10/g10.c:241
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/g10.c:235
+#: g10/g10.c:242
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/g10.c:236
+#: g10/g10.c:243
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: g10/g10.c:237
+#: g10/g10.c:244
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: g10/g10.c:238
+#: g10/g10.c:245
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/g10.c:239
+#: g10/g10.c:246
 msgid "always use a MDC for encryption"
 msgstr "usa sempre un MDC per cifrare"
 
-#: g10/g10.c:240
+#: g10/g10.c:247
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:242
+#: g10/g10.c:249
 msgid "batch mode: never ask"
 msgstr "modo batch: non fare domande"
 
-#: g10/g10.c:243
+#: g10/g10.c:250
 msgid "assume yes on most questions"
 msgstr "assumi \"sЛ\" a quasi tutte le domande"
 
-#: g10/g10.c:244
+#: g10/g10.c:251
 msgid "assume no on most questions"
 msgstr "assumi \"no\" a quasi tutte le domande"
 
-#: g10/g10.c:245
+#: g10/g10.c:252
 msgid "add this keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: g10/g10.c:246
+#: g10/g10.c:253
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: g10/g10.c:247
+#: g10/g10.c:254
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|usa NAME come chiave segreta predefinita"
 
-#: g10/g10.c:248
+#: g10/g10.c:255
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: g10/g10.c:249
+#: g10/g10.c:256
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|imposta il set di caratteri del terminale NOME"
 
-#: g10/g10.c:250
+#: g10/g10.c:257
 msgid "read options from file"
 msgstr "leggi le opzioni dal file"
 
-#: g10/g10.c:252
+#: g10/g10.c:259
 msgid "set debugging flags"
 msgstr "imposta i flag di debugging"
 
-#: g10/g10.c:253
+#: g10/g10.c:260
 msgid "enable full debugging"
 msgstr "abilita il debugging completo"
 
-#: g10/g10.c:254
+#: g10/g10.c:261
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato su questo fd"
 
-#: g10/g10.c:255
+#: g10/g10.c:262
 msgid "do not write comment packets"
 msgstr "non scrivere pacchetti di commento"
 
-#: g10/g10.c:256
+#: g10/g10.c:263
 msgid "(default is 1)"
 msgstr "(predefinito Х 1)"
 
-#: g10/g10.c:257
+#: g10/g10.c:264
 msgid "(default is 3)"
 msgstr "(predefinito Х 3)"
 
-#: g10/g10.c:259
+#: g10/g10.c:266
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: g10/g10.c:260
+#: g10/g10.c:267
 msgid "emulate the mode described in RFC1991"
 msgstr "emula il modo descritto in RFC 1991"
 
-#: g10/g10.c:261
+#: g10/g10.c:268
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "imposta per OpenPGP le opzioni di pacchetto, cifrario e digest"
 
-#: g10/g10.c:262
+#: g10/g10.c:269
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa il modo N per la passphrase"
 
-#: g10/g10.c:264
+#: g10/g10.c:271
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|usa l'algoritmo di message digest NOME"
 
-#: g10/g10.c:266
+#: g10/g10.c:273
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|usa l'alg. di cifratura NOME per le passphrase"
 
-#: g10/g10.c:267
+#: g10/g10.c:274
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|usa l'algoritmo di cifratura NOME"
 
-#: g10/g10.c:268
+#: g10/g10.c:275
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|usa l'algoritmo di message digest NOME"
 
-#: g10/g10.c:269
+#: g10/g10.c:276
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: g10/g10.c:270
+#: g10/g10.c:277
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina il campo keyid dei pacchetti cifrati"
 
-#: g10/g10.c:271
+#: g10/g10.c:278
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALORE|usa questi dati per una nota"
 
-#: g10/g10.c:273
+#: g10/g10.c:280
 msgid ""
 "@\n"
 "Examples:\n"
@@ -586,15 +602,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:353
+#: g10/g10.c:360
 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:357
+#: g10/g10.c:364
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [file] (-h per l'aiuto)"
 
-#: g10/g10.c:360
+#: g10/g10.c:367
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -604,7 +620,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:365
+#: g10/g10.c:372
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -612,161 +628,173 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:439
+#: g10/g10.c:446
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [options] "
 
-#: g10/g10.c:492
+#: g10/g10.c:499
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:626
+#: g10/g10.c:633
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file con le opzioni predefinite `%s'\n"
 
-#: g10/g10.c:630
+#: g10/g10.c:637
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:637
+#: g10/g10.c:644
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:805
+#: g10/g10.c:824
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non Х un set di caratteri valido\n"
 
-#: g10/g10.c:852 g10/g10.c:864
+#: g10/g10.c:872 g10/g10.c:884
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non Х valido\n"
 
-#: g10/g10.c:858 g10/g10.c:870
+#: g10/g10.c:878 g10/g10.c:890
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non Х valido\n"
 
-#: g10/g10.c:874
+#: g10/g10.c:894
 msgid "the given policy URL is invalid\n"
 msgstr "L'URL della policy indicato non Х valido\n"
 
-#: g10/g10.c:877
+#: g10/g10.c:897
 #, 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:879
+#: g10/g10.c:899
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:881
+#: g10/g10.c:901
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:883
+#: g10/g10.c:903
 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:886
+#: g10/g10.c:906
 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:890
+#: g10/g10.c:910
 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:967
+#: g10/g10.c:987
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:973
+#: g10/g10.c:993
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:980
+#: g10/g10.c:1000
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:988
+#: g10/g10.c:1008
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:1001
+#: g10/g10.c:1021
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1034
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:1028
+#: g10/g10.c:1048
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:1040
+#: g10/g10.c:1060
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:1049
-msgid "--edit-key username [commands]"
+#: g10/g10.c:1068
+msgid "--sign-key user-id"
+msgstr ""
+
+#: g10/g10.c:1076
+#, fuzzy
+msgid "--lsign-key user-id"
+msgstr "--delete-key nomeutente"
+
+#: g10/g10.c:1084
+#, fuzzy
+msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nomeutente [comandi]"
 
-#: g10/g10.c:1063
-msgid "--delete-secret-key username"
+#: g10/g10.c:1100
+#, fuzzy
+msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key nomeutente"
 
-#: g10/g10.c:1066
-msgid "--delete-key username"
+#: g10/g10.c:1103
+#, fuzzy
+msgid "--delete-key user-id"
 msgstr "--delete-key nomeutente"
 
-#: g10/encode.c:231 g10/g10.c:1090 g10/sign.c:366
+#: g10/encode.c:231 g10/g10.c:1127 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/g10.c:1101
+#: g10/g10.c:1138
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [userid] [portachiavi]"
 
-#: g10/g10.c:1162
+#: g10/g10.c:1199
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1170
+#: g10/g10.c:1207
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1275
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:1317
+#: g10/g10.c:1356
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:1321
+#: g10/g10.c:1360
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1324 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1363 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/g10.c:1493
+#: g10/g10.c:1532
 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:1499
+#: g10/g10.c:1538
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -774,11 +802,11 @@ msgstr ""
 "il nome di una nota deve essere formato solo da lettere, numeri, punti o\n"
 "underscore e deve finire con `='\n"
 
-#: g10/g10.c:1505
+#: g10/g10.c:1544
 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:1513
+#: g10/g10.c:1552
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
@@ -857,7 +885,14 @@ msgstr ""
 "carattere quoted printable nell'armatura - probabilmente Х stato usato\n"
 "un MTA buggato\n"
 
-#: g10/pkclist.c:137
+# valid user replies (not including 1..4)
+# [Marco, you can change 'm' and 's' to whatever letters you like]
+#. a string with valid answers
+#: g10/pkclist.c:140
+msgid "sSmMqQ"
+msgstr "sSmMqQ"
+
+#: g10/pkclist.c:144
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -866,7 +901,7 @@ msgstr ""
 "Nessun valore di fiducia assegnato a %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:147
+#: g10/pkclist.c:154
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -888,30 +923,23 @@ msgstr ""
 " 4 = Mi fido completamente\n"
 " s = mostrami ulteriori informazioni\n"
 
-#: g10/pkclist.c:156
+#: g10/pkclist.c:163
 msgid " m = back to the main menu\n"
 msgstr " m = torna al menЫ principale\n"
 
-#: g10/pkclist.c:158
+#: g10/pkclist.c:165
 msgid " q = quit\n"
 msgstr " q = abbandona\n"
 
-# valid user replies (not including 1..4)
-# [Marco, you can change 'm' and 's' to whatever letters you like]
-#. a string with valid answers
-#: g10/pkclist.c:163
-msgid "sSmMqQ"
-msgstr "sSmMqQ"
-
-#: g10/pkclist.c:167
+#: g10/pkclist.c:171
 msgid "Your decision? "
 msgstr "Cosa hai deciso? "
 
-#: g10/pkclist.c:187
+#: g10/pkclist.c:193
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificati che portano a chiavi definitivamente affidabili:\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:264
 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"
@@ -921,20 +949,20 @@ msgstr ""
 "se possiamo assegnare qualche valore di fiducia del proprietario mancante.\n"
 "\n"
 
-#: g10/pkclist.c:262
+#: g10/pkclist.c:270
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
 msgstr ""
 "Non Х stato trovato alcun percorso che porti a una delle nostre chiavi.\n"
 
-#: g10/pkclist.c:264
+#: g10/pkclist.c:272
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
 msgstr "Non Х stato trovato alcun certificato con fiducia non definita.\n"
 
-#: g10/pkclist.c:266
+#: g10/pkclist.c:274
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -942,37 +970,37 @@ msgstr ""
 "Nessun valore di fiducia modificato.\n"
 "\n"
 
-#: g10/pkclist.c:283
+#: g10/pkclist.c:291
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "chiave %08lX: la chiave Х stata revocata!\n"
 
-#: g10/pkclist.c:289 g10/pkclist.c:299 g10/pkclist.c:405
+#: g10/pkclist.c:297 g10/pkclist.c:307 g10/pkclist.c:413
 msgid "Use this key anyway? "
 msgstr "Uso lo stesso questa chiave? "
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:301
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "chiave %08lX: la subchiave Х stata revocata!\n"
 
-#: g10/pkclist.c:323
+#: g10/pkclist.c:331
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: la chiave Х scaduta\n"
 
-#: g10/pkclist.c:329
+#: g10/pkclist.c:337
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr ""
 "%08lX: mancano informazioni su come calcolare una probabilitЮ di fiducia\n"
 
-#: g10/pkclist.c:343
+#: g10/pkclist.c:351
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: NON ci fidiamo di questa chiave!\n"
 
-#: g10/pkclist.c:349
+#: g10/pkclist.c:357
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -981,15 +1009,15 @@ msgstr ""
 "%08lX: Non Х sicuro che questa chiave appartenga veramente al proprietario\n"
 "ma Х accettata comunque\n"
 
-#: g10/pkclist.c:355
+#: g10/pkclist.c:363
 msgid "This key probably belongs to the owner\n"
 msgstr "Questa chiave probabilmente appartiene al proprietario\n"
 
-#: g10/pkclist.c:360
+#: g10/pkclist.c:368
 msgid "This key belongs to us\n"
 msgstr "Questa chiave ci appartiene\n"
 
-#: g10/pkclist.c:400
+#: g10/pkclist.c:408
 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"
@@ -1001,65 +1029,65 @@ msgstr ""
 "prossima domanda.\n"
 "\n"
 
-#: g10/pkclist.c:413 g10/pkclist.c:435
+#: g10/pkclist.c:421 g10/pkclist.c:443
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENZIONE: uso di una chiave non fidata!\n"
 
-#: g10/pkclist.c:456
+#: g10/pkclist.c:464
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa chiave Х stata revocata dal suo proprietario!\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:465
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Questo puР significare che la firma Х stata falsificata.\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:469
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa subchiave Х stata revocata dal proprietario!\n"
 
-#: g10/pkclist.c:482
+#: g10/pkclist.c:490
 msgid "Note: This key has expired!\n"
 msgstr "Nota: questa chiave Х scaduta!\n"
 
-#: g10/pkclist.c:489
+#: g10/pkclist.c:497
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "ATTENZIONE: questa chiave non Х certificata con una firma fidata!\n"
 
-#: g10/pkclist.c:491
+#: g10/pkclist.c:499
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Non ci sono indicazioni che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:507
+#: g10/pkclist.c:515
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:516
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          La firma Х probabilmente un FALSO.\n"
 
-#: g10/pkclist.c:515
+#: g10/pkclist.c:523
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENZIONE: questa chiave non Х certificata con firme abbastanza fidate!\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:526
 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:582 g10/pkclist.c:604 g10/pkclist.c:670 g10/pkclist.c:715
+#: g10/pkclist.c:627 g10/pkclist.c:649 g10/pkclist.c:758 g10/pkclist.c:803
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: saltata: %s\n"
 
-#: g10/pkclist.c:590 g10/pkclist.c:697
+#: g10/pkclist.c:635 g10/pkclist.c:785
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: saltato: chiave pubblica giЮ presente\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:662
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1067,30 +1095,34 @@ msgstr ""
 "Non hai specificato un user ID. (puoi usare \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:618
+#: g10/pkclist.c:672
 msgid "Enter the user ID: "
 msgstr "Inserisci l'user ID: "
 
-#: g10/pkclist.c:629
+#: g10/pkclist.c:684
 msgid "No such user ID.\n"
 msgstr "User ID inesistente.\n"
 
-#: g10/pkclist.c:639
+#: g10/pkclist.c:704
 #, fuzzy
 msgid "Public key is disabled.\n"
 msgstr "la chiave pubblica Х %08lX\n"
 
-#: g10/pkclist.c:678
+#: g10/pkclist.c:733
+msgid "unknown default recipient `s'\n"
+msgstr ""
+
+#: g10/pkclist.c:766
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: errore nel controllare la chiave: %s\n"
 
-#: g10/pkclist.c:683
+#: g10/pkclist.c:771
 #, fuzzy, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: saltato: chiave pubblica giЮ presente\n"
 
-#: g10/pkclist.c:721
+#: g10/pkclist.c:809
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
@@ -1478,238 +1510,238 @@ msgstr "troppe voci nella unk cache - disabilitata\n"
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 
-#: g10/import.c:116
+#: g10/import.c:117
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/import.c:160
+#: g10/import.c:161
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "salto un blocco di tipo %d\n"
 
-#: g10/import.c:167 g10/trustdb.c:1658 g10/trustdb.c:1697
+#: g10/import.c:168 g10/trustdb.c:1658 g10/trustdb.c:1697
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "Per ora sono state esaminate %lu chiavi\n"
 
-#: g10/import.c:172
+#: g10/import.c:173
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/import.c:175
+#: g10/import.c:176
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Numero totale esaminato: %lu\n"
 
-#: g10/import.c:177
+#: g10/import.c:178
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "senza user ID: %lu\n"
 
-#: g10/import.c:179
+#: g10/import.c:180
 #, c-format
 msgid "              imported: %lu"
 msgstr "importate: %lu"
 
-#: g10/import.c:185
+#: g10/import.c:186
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "non modificate: %lu\n"
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "nuovi user ID: %lu\n"
 
-#: g10/import.c:189
+#: g10/import.c:190
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "nuove subchiavi: %lu\n"
 
-#: g10/import.c:191
+#: g10/import.c:192
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "nuove firme: %lu\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "nuove revoche di chiavi: %lu\n"
 
-#: g10/import.c:195
+#: g10/import.c:196
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "chiavi segrete lette: %lu\n"
 
-#: g10/import.c:197
+#: g10/import.c:198
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chiavi segrete importate %lu\n"
 
-#: g10/import.c:199
+#: g10/import.c:200
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chiavi segrete non cambiate %lu\n"
 
-#: g10/import.c:342 g10/import.c:526
+#: g10/import.c:361 g10/import.c:550
 #, c-format
 msgid "key %08lX: no user id\n"
 msgstr "chiave %08lX: nessun user id\n"
 
-#: g10/import.c:353
+#: g10/import.c:372
 #, c-format
 msgid "key %08lX: no valid user ids\n"
 msgstr "chiave %08lX: nessun user id valido\n"
 
-#: g10/import.c:355
+#: g10/import.c:374
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo puР essere causato da una autofirma mancante\n"
 
-#: g10/import.c:366 g10/import.c:593
+#: g10/import.c:385 g10/import.c:617
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/import.c:372
+#: g10/import.c:391
 msgid "no default public keyring\n"
 msgstr "nessun portachiavi pubblico predefinito\n"
 
-#: g10/import.c:376 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
+#: g10/import.c:395 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: g10/import.c:379 g10/import.c:432 g10/import.c:541 g10/import.c:642
+#: g10/import.c:398 g10/import.c:456 g10/import.c:565 g10/import.c:666
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "impossibile fare il lock del portachiavi `%s': %s\n"
 
-#: g10/import.c:382 g10/import.c:435 g10/import.c:544 g10/import.c:645
+#: g10/import.c:401 g10/import.c:459 g10/import.c:568 g10/import.c:669
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/import.c:387
+#: g10/import.c:406
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "chiave %08lX: chiave pubblica importata\n"
 
-#: g10/import.c:399
+#: g10/import.c:423
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:408 g10/import.c:601
+#: g10/import.c:432 g10/import.c:625
 #, 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:414 g10/import.c:607
+#: g10/import.c:438 g10/import.c:631
 #, 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:441
+#: g10/import.c:465
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
 msgstr "chiave %08lX: un nuovo user id\n"
 
-#: g10/import.c:444
+#: g10/import.c:468
 #, c-format
 msgid "key %08lX: %d new user-ids\n"
 msgstr "chiave %08lX: %d nuovi user id\n"
 
-#: g10/import.c:447
+#: g10/import.c:471
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "chiave %08lX: una nuova firma\n"
 
-#: g10/import.c:450
+#: g10/import.c:474
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "chiave %08lX: %d nuove firme\n"
 
-#: g10/import.c:453
+#: g10/import.c:477
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "chiave %08lX: una nuova subchiave\n"
 
-#: g10/import.c:456
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "chiave %08lX: %d nuove subchiavi\n"
 
-#: g10/import.c:466
+#: g10/import.c:490
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "chiave %08lX: non cambiata\n"
 
-#: g10/import.c:549
+#: g10/import.c:573
 #, 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:553
+#: g10/import.c:577
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chiave %08lX: giЮ nel portachiavi segreto\n"
 
-#: g10/import.c:558
+#: g10/import.c:582
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/import.c:587
+#: g10/import.c:611
 #, 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:618
+#: g10/import.c:642
 #, 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:650
+#: g10/import.c:674
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "chiave %08lX: certificato di revoca importato\n"
 
-#: g10/import.c:683
+#: g10/import.c:707
 #, c-format
 msgid "key %08lX: no user-id for signature\n"
 msgstr "chiave %08lX: nessun user id per la firma\n"
 
-#: g10/import.c:690 g10/import.c:714
+#: g10/import.c:714 g10/import.c:738
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
-#: g10/import.c:691
+#: g10/import.c:715
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "chiave %08lX: autofirma non valida\n"
 
-#: g10/import.c:706
+#: g10/import.c:730
 #, 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:715
+#: g10/import.c:739
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chiave %08lX: legame con la subchiave non valido:\n"
 
-#: g10/import.c:747
+#: g10/import.c:771
 #, c-format
 msgid "key %08lX: skipped userid '"
 msgstr "chiave %08lX: saltato l'user id '"
 
-#: g10/import.c:770
+#: g10/import.c:794
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chiave %08lX: saltata la subchiave\n"
@@ -1718,32 +1750,32 @@ msgstr "chiave %08lX: saltata la subchiave\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:795
+#: g10/import.c:819
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "chiave %08lX: firma non esportabile (chiave %02x) - saltata\n"
 
-#: g10/import.c:804
+#: g10/import.c:828
 #, 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:812
+#: g10/import.c:836
 #, 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:912
+#: g10/import.c:936
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
 
-#: g10/import.c:963
+#: g10/import.c:987
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca aggiunto\n"
 
-#: g10/import.c:1076 g10/import.c:1131
+#: g10/import.c:1100 g10/import.c:1155
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chiave %08lX: la nostra copia non ha autofirma\n"
@@ -1829,7 +1861,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:370 g10/keyedit.c:1806 g10/keyedit.c:1855 g10/sign.c:128
+#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:128
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
@@ -1871,387 +1903,387 @@ msgstr "Vuoi veramente farlo?"
 msgid "moving a key signature to the correct place\n"
 msgstr "spostamento della firma di una chiave nel posto corretto\n"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:564
 msgid "quit this menu"
 msgstr "abbandona questo menЫ"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:565
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:563
+#: g10/keyedit.c:566
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:563
+#: g10/keyedit.c:566
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:567
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:567
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:569
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:569
 msgid "show fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/keyedit.c:567
+#: g10/keyedit.c:570
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:567
+#: g10/keyedit.c:570
 msgid "list key and user ids"
 msgstr "elenca le chiavi e gli user id"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:571
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:572
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:572
 msgid "select user id N"
 msgstr "scegli l'user id N"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:573
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:573
 msgid "select secondary key N"
 msgstr "scegli la chiave secondaria N"
 
-#: g10/keyedit.c:571
+#: g10/keyedit.c:574
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:571
+#: g10/keyedit.c:574
 msgid "list signatures"
 msgstr "elenca le firme"
 
-#: g10/keyedit.c:572
+#: g10/keyedit.c:575
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:573
+#: g10/keyedit.c:576
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:573
+#: g10/keyedit.c:576
 msgid "sign the key"
 msgstr "firma la chiave"
 
-#: g10/keyedit.c:574
+#: g10/keyedit.c:577
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:578
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:578
 msgid "sign the key locally"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:576
+#: g10/keyedit.c:579
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:580
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:580
 msgid "add a user id"
 msgstr "aggiungi un user id"
 
-#: g10/keyedit.c:578
+#: g10/keyedit.c:581
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:578
+#: g10/keyedit.c:581
 msgid "delete user id"
 msgstr "cancella un user id"
 
-#: g10/keyedit.c:579
+#: g10/keyedit.c:582
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:579
+#: g10/keyedit.c:582
 msgid "add a secondary key"
 msgstr "aggiungi una chiave secondaria"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:583
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:583
 msgid "delete a secondary key"
 msgstr "cancella una chiave secondaria"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:584
 msgid "delsig"
 msgstr "delsign"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:584
 msgid "delete signatures"
 msgstr "cancella le firme"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:585
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:585
 msgid "change the expire date"
 msgstr "cambia la data di scadenza"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:586
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:586
 msgid "toggle between secret and public key listing"
 msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:588
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:589
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:589
 msgid "list preferences"
 msgstr "elenca le impostazioni"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:590
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:590
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:592
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:592
 msgid "revoke signatures"
 msgstr "revoca firme"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:593
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:593
 msgid "revoke a secondary key"
 msgstr "revoca una chiave secondaria"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:594
 msgid "disable"
 msgstr ""
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:594
 #, fuzzy
 msgid "disable a key"
 msgstr "chiave sbagliata"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:595
 msgid "enable"
 msgstr ""
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:595
 #, fuzzy
 msgid "enable a key"
 msgstr "chiave sbagliata"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:614
 msgid "can't do that in batchmode\n"
 msgstr "impossibile fare questo in batch mode\n"
 
 #. check that they match
-#. FIXME: check that they both match
-#: g10/keyedit.c:640
+#. fixme: check that they both match
+#: g10/keyedit.c:652
 msgid "Secret key is available.\n"
 msgstr "х disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:681
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:711
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:718
-msgid "Save changes? "
-msgstr "Salvo i cambiamenti? "
-
-#: g10/keyedit.c:721
-msgid "Quit without saving? "
-msgstr "Esco senza salvare? "
-
-#: g10/keyedit.c:731
-#, c-format
-msgid "update failed: %s\n"
-msgstr "aggiornamento fallito: %s\n"
-
-#: g10/keyedit.c:738
-#, c-format
-msgid "update secret failed: %s\n"
-msgstr "aggiornamento della chiave segreta fallito: %s\n"
-
-#: g10/keyedit.c:745
-msgid "Key not changed so no update needed.\n"
-msgstr "La chiave non Х cambiata quindi non sono necessari aggiornamenti.\n"
-
-#: g10/keyedit.c:748 g10/keyedit.c:807
-#, c-format
-msgid "update of trustdb failed: %s\n"
-msgstr "aggiornamento del trustdb fallito: %s\n"
-
-#: g10/keyedit.c:781
+#: g10/keyedit.c:758
 msgid "Really sign all user ids? "
 msgstr "Firmo davvero tutti gli user id? "
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:759
 msgid "Hint: Select the user ids to sign\n"
 msgstr "Suggerimento: seleziona gli user id da firmare\n"
 
-#: g10/keyedit.c:818 g10/keyedit.c:839
+#: g10/keyedit.c:786 g10/keyedit.c:968
+#, c-format
+msgid "update of trustdb failed: %s\n"
+msgstr "aggiornamento del trustdb fallito: %s\n"
+
+#: g10/keyedit.c:797 g10/keyedit.c:818
 msgid "You must select at least one user id.\n"
 msgstr "Devi selezionare almeno un user id.\n"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:799
 msgid "You can't delete the last user id!\n"
 msgstr "Non puoi cancellare l'ultimo user id!\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:802
 msgid "Really remove all selected user ids? "
 msgstr "Tolgo davvero tutti gli user id selezionati? "
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:803
 msgid "Really remove this user id? "
 msgstr "Tolgo davvero questo user id? "
 
-#: g10/keyedit.c:860 g10/keyedit.c:882
+#: g10/keyedit.c:839 g10/keyedit.c:861
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:864
+#: g10/keyedit.c:843
 msgid "Do you really want to delete the selected keys? "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:865
+#: g10/keyedit.c:844
 msgid "Do you really want to delete this key? "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:865
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Vuoi davvero revocare le chiavi selezionate? "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:866
 msgid "Do you really want to revoke this key? "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:932
+msgid "Save changes? "
+msgstr "Salvo i cambiamenti? "
+
+#: g10/keyedit.c:935
+msgid "Quit without saving? "
+msgstr "Esco senza salvare? "
+
+#: g10/keyedit.c:946
+#, c-format
+msgid "update failed: %s\n"
+msgstr "aggiornamento fallito: %s\n"
+
+#: g10/keyedit.c:953
+#, c-format
+msgid "update secret failed: %s\n"
+msgstr "aggiornamento della chiave segreta fallito: %s\n"
+
+#: g10/keyedit.c:960
+msgid "Key not changed so no update needed.\n"
+msgstr "La chiave non Х cambiata quindi non sono necessari aggiornamenti.\n"
+
+#: g10/keyedit.c:975
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/keyedit.c:1039
+#: g10/keyedit.c:1065
 #, fuzzy
 msgid "This key has been disabled"
 msgstr "Nota: questa chiave Х scaduta!\n"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1336
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1340
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1344
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1350
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:1338
+#: g10/keyedit.c:1364
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1365
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1368
 msgid "Nothing deleted.\n"
 msgstr "Non Х stato cancellato nulla.\n"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1437
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1443
 msgid "Please select at most one secondary key.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1447
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1449
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:1464
+#: g10/keyedit.c:1490
 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:1480
+#: g10/keyedit.c:1506
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:1540
+#: g10/keyedit.c:1566
 #, c-format
 msgid "No user id with index %d\n"
 msgstr "Nessun user id con l'indice %d\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1612
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nessuna chiave secondaria con l'indice %d\n"
 
-#: g10/keyedit.c:1684
+#: g10/keyedit.c:1710
 msgid "user ID: \""
 msgstr "user ID: \""
 
-#: g10/keyedit.c:1687
+#: g10/keyedit.c:1713
 #, c-format
 msgid ""
 "\"\n"
@@ -2261,15 +2293,15 @@ msgstr ""
 "firmata con la tua chiave %08lX a %s\n"
 "\n"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1717
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Creare un certificato di revoca per questa firma? (s/N)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1797
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Creare davvero i certificati di revoca? (s/N)"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1820
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
@@ -3224,6 +3256,9 @@ msgstr "Non Х disponibile un aiuto"
 msgid "No help available for `%s'"
 msgstr "Non Х disponibile un aiuto per `%s'"
 
+#~ msgid "print all message digests"
+#~ msgstr "stampa tutti i message digests"
+
 #~ msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n"
 #~ msgstr ""
 #~ "NOTA: rec di %lu[%d] nella hintlist di %lu ma marcato come verificato\n"
diff --git a/po/pl.po b/po/pl.po
index 38cf53b1a..f7e2fa312 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-0.9.7\n"
-"POT-Creation-Date: 1999-07-12 15:04+0200\n"
+"POT-Creation-Date: 1999-07-14 11:47+0200\n"
 "PO-Revision-Date: 1999-05-30 19:08+02:00\n"
 "Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -42,7 +42,7 @@ msgstr "tak"
 msgid "yY"
 msgstr "tT"
 
-#: g10/keyedit.c:561 util/miscutil.c:272
+#: g10/keyedit.c:564 util/miscutil.c:272
 msgid "quit"
 msgstr "wyj╤cie"
 
@@ -285,7 +285,7 @@ msgstr ""
 "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:177
+#: g10/g10.c:180
 msgid ""
 "@Commands:\n"
 " "
@@ -293,131 +293,138 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/g10.c:179
+#: g10/g10.c:182
 msgid "|[file]|make a signature"
 msgstr "|[plik]|zЁo©enie podpisu"
 
-#: g10/g10.c:180
+#: g10/g10.c:183
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|zЁo©enie podpisu na czytelnym dokumencie"
 
-#: g10/g10.c:181
+#: g10/g10.c:184
 msgid "make a detached signature"
 msgstr "sporz╠dzenie podpisu oddzielonego od dokumentu"
 
-#: g10/g10.c:182
+#: g10/g10.c:185
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/g10.c:183
+#: g10/g10.c:186
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/g10.c:184
+#: g10/g10.c:187
 msgid "store only"
 msgstr "tylko zapis"
 
-#: g10/g10.c:185
+#: g10/g10.c:188
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy╤lnie)"
 
-#: g10/g10.c:186
+#: g10/g10.c:189
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/g10.c:187
+#: g10/g10.c:190
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/g10.c:189
+#: g10/g10.c:192
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpisСw"
 
-#: g10/g10.c:190
+#: g10/g10.c:193
 msgid "check key signatures"
 msgstr "sprawdzenie podpisСw kluczy"
 
-#: g10/g10.c:191
+#: g10/g10.c:194
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odciskСw"
 
-#: g10/g10.c:192
+#: g10/g10.c:195
 msgid "list secret keys"
 msgstr "lista kluczy tajnych"
 
-#: g10/g10.c:193
+#: g10/g10.c:196
 msgid "generate a new key pair"
 msgstr "generacja nowej pary klucza"
 
-#: g10/g10.c:194
+#: g10/g10.c:197
 msgid "remove key from the public keyring"
 msgstr "usuniЙcie klucza ze zbioru kluczy publicznych"
 
-#: g10/g10.c:195
+#: g10/g10.c:198
+#, fuzzy
+msgid "sign a key"
+msgstr "zЁo©enie podpisu na kluczu"
+
+#: g10/g10.c:199
+#, fuzzy
+msgid "sign a key locally"
+msgstr "zЁo©enie lokalnego podpisu na kluczu"
+
+#: g10/g10.c:200
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/g10.c:196
+#: g10/g10.c:201
 msgid "generate a revocation certificate"
 msgstr "generacja certyfikatu uniewa©nienia klucza"
 
-#: g10/g10.c:197
+#: g10/g10.c:202
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/g10.c:198
+#: g10/g10.c:203
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/g10.c:199
+#: g10/g10.c:204
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/g10.c:202
+#: g10/g10.c:207
 msgid "import/merge keys"
 msgstr "import/doЁ╠czenie kluczy"
 
-#: g10/g10.c:204
+#: g10/g10.c:209
 msgid "list only the sequence of packets"
 msgstr "wypisane sekwencji pakietСw"
 
-#: g10/g10.c:206
+#: g10/g10.c:211
 msgid "export the ownertrust values"
 msgstr "eksport warto╤ci zaufania"
 
-#: g10/g10.c:208
+#: g10/g10.c:213
 msgid "import ownertrust values"
 msgstr "wczytanie warto╤Фi zaufania"
 
-#: g10/g10.c:210
-msgid "|[NAMES]|update the trust database"
+#: g10/g10.c:215
+#, fuzzy
+msgid "update the trust database"
 msgstr "|[NAZWY]|naniesienie poprawek do bazy zaufania"
 
-#: g10/g10.c:212
+#: g10/g10.c:217
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAZWY]|sprawdzenie bazy zaufania"
 
-#: g10/g10.c:213
+#: g10/g10.c:218
 msgid "fix a corrupted trust database"
 msgstr "naprawa uszkodzonej Bazy Zaufania"
 
-#: g10/g10.c:214
+#: g10/g10.c:219
 msgid "De-Armor a file or stdin"
 msgstr "zdjЙcie opakowania ASCII pliku lub potoku"
 
-#: g10/g10.c:215
+#: g10/g10.c:220
 msgid "En-Armor a file or stdin"
 msgstr "opakowanie ASCII pliku lub potoku"
 
-#: g10/g10.c:216
+#: g10/g10.c:221
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skrСty wiadomo╤ci"
 
-#: g10/g10.c:217
-msgid "print all message digests"
-msgstr "wszystkie skrСty wiadomo╤ci"
-
-#: g10/g10.c:223
+#: g10/g10.c:225
 msgid ""
 "@\n"
 "Options:\n"
@@ -427,160 +434,169 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/g10.c:225
+#: g10/g10.c:227
 msgid "create ascii armored output"
 msgstr "plik wynikowy w opakowaniu ASCII"
 
-#: g10/g10.c:226
+#: g10/g10.c:228
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
+#, fuzzy
+msgid "|NAME|use NAME as default recipient"
+msgstr "|NAZWA|u©ycie NAZWA jako domy╤lnego klucza tajnego"
+
+#: g10/g10.c:233
+msgid "use the default key as default recipient"
+msgstr ""
+
+#: g10/g10.c:237
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/g10.c:231
+#: g10/g10.c:238
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - brak)"
 
-#: g10/g10.c:233
+#: g10/g10.c:240
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/g10.c:234
+#: g10/g10.c:241
 msgid "use as output file"
 msgstr "plik wyj╤ciowy"
 
-#: g10/g10.c:235
+#: g10/g10.c:242
 msgid "verbose"
 msgstr "z informacjami dodatkowymi"
 
-#: g10/g10.c:236
+#: g10/g10.c:243
 msgid "be somewhat more quiet"
 msgstr "mniej komunikatСww"
 
-#: g10/g10.c:237
+#: g10/g10.c:244
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: g10/g10.c:238
+#: g10/g10.c:245
 msgid "force v3 signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpisСw"
 
-#: g10/g10.c:239
+#: g10/g10.c:246
 msgid "always use a MDC for encryption"
 msgstr "do szyfrowania bЙdzie u©ywany MDC"
 
-#: g10/g10.c:240
+#: g10/g10.c:247
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:242
+#: g10/g10.c:249
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: ©adnych pytaЯ"
 
-#: g10/g10.c:243
+#: g10/g10.c:250
 msgid "assume yes on most questions"
 msgstr "automatyczna odpowied╪ tak na wiЙkszo╤Ф pytaЯ"
 
-#: g10/g10.c:244
+#: g10/g10.c:251
 msgid "assume no on most questions"
 msgstr "automatyczna odpowied╪ nie na wiЙkszo╤Ф pytaЯ"
 
-#: g10/g10.c:245
+#: g10/g10.c:252
 msgid "add this keyring to the list of keyrings"
 msgstr "dodaФ zbiСr kluczy do listy u©ywanych"
 
-#: g10/g10.c:246
+#: g10/g10.c:253
 msgid "add this secret keyring to the list"
 msgstr "dodaФ zbiСr kluczy tajnych do listy"
 
-#: g10/g10.c:247
+#: g10/g10.c:254
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|u©ycie NAZWA jako domy╤lnego klucza tajnego"
 
-#: g10/g10.c:248
+#: g10/g10.c:255
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|serwer kluczy w ktСrym bЙd╠ poszukiwane"
 
-#: g10/g10.c:249
+#: g10/g10.c:256
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAZWA|zestaw znakСw terminala NAZWA"
 
-#: g10/g10.c:250
+#: g10/g10.c:257
 msgid "read options from file"
 msgstr "wczytanie opcji z pliku"
 
-#: g10/g10.c:252
+#: g10/g10.c:259
 msgid "set debugging flags"
 msgstr "ustawienie opcji ╤ledzenia wykonania programu"
 
-#: g10/g10.c:253
+#: g10/g10.c:260
 msgid "enable full debugging"
 msgstr "umo©liwienie peЁnego ╤ledzenia programu"
 
-#: g10/g10.c:254
+#: g10/g10.c:261
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapisaФ opis stanu do FD"
 
-#: g10/g10.c:255
+#: g10/g10.c:262
 msgid "do not write comment packets"
 msgstr "nie zapisywaФ pakietСw z komentarzem"
 
-#: g10/g10.c:256
+#: g10/g10.c:263
 msgid "(default is 1)"
 msgstr "(domy╤lnie 1)"
 
-#: g10/g10.c:257
+#: g10/g10.c:264
 msgid "(default is 3)"
 msgstr "(domy╤lnie 3)"
 
-#: g10/g10.c:259
+#: g10/g10.c:266
 msgid "|FILE|load extension module FILE"
 msgstr "|PLIK|Ёadowanie moduЁu rozszerzenia z PLIK"
 
-#: g10/g10.c:260
+#: g10/g10.c:267
 msgid "emulate the mode described in RFC1991"
 msgstr "emulacja trybu opisanego w RFC1991"
 
-#: g10/g10.c:261
+#: g10/g10.c:268
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:262
+#: g10/g10.c:269
 msgid "|N|use passphrase mode N"
 msgstr "|N|N-ty tryb wprowadzania wyra©enia przej╤ciowego"
 
-#: g10/g10.c:264
+#: g10/g10.c:271
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|ALG|algorytm obliczania skrСtСw wiadomo╤ci ALG"
 
-#: g10/g10.c:266
+#: g10/g10.c:273
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ALG|algorytmu szyfruj╠cy ALG dla hasЁa"
 
-#: g10/g10.c:267
+#: g10/g10.c:274
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|algorytm szyfruj╠cy NAZWA"
 
-#: g10/g10.c:268
+#: g10/g10.c:275
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|algorytm obliczania skrСtСw wiadomo╤ci NAZWA"
 
-#: g10/g10.c:269
+#: g10/g10.c:276
 msgid "|N|use compress algorithm N"
 msgstr "|N|algorytm kompresji N"
 
-#: g10/g10.c:270
+#: g10/g10.c:277
 msgid "throw keyid field of encrypted packets"
 msgstr "usuniЙcie identyfikatorСw kluczy z pakietСw"
 
-#: g10/g10.c:271
+#: g10/g10.c:278
 msgid "|NAME=VALUE|use this notation data"
 msgstr ""
 
-#: g10/g10.c:273
+#: g10/g10.c:280
 msgid ""
 "@\n"
 "Examples:\n"
@@ -601,15 +617,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/g10.c:353
+#: g10/g10.c:360
 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:357
+#: g10/g10.c:364
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "WywoЁanie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:360
+#: g10/g10.c:367
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -619,7 +635,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpisСw, szyfrowanie, deszyfrowanie\n"
 "domy╤lnie wykonywana operacja zale©y od danych wej╤ciowych\n"
 
-#: g10/g10.c:365
+#: g10/g10.c:372
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -627,169 +643,181 @@ msgstr ""
 "\n"
 "ObsЁugiwane algorytmy:\n"
 
-#: g10/g10.c:439
+#: g10/g10.c:446
 msgid "usage: gpg [options] "
 msgstr "wywoЁanie: gpg [opcje]"
 
-#: g10/g10.c:492
+#: g10/g10.c:499
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/g10.c:626
+#: g10/g10.c:633
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy╤lnego pliku opcji '%s'\n"
 
-#: g10/g10.c:630
+#: g10/g10.c:637
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji '%s': %s\n"
 
-#: g10/g10.c:637
+#: g10/g10.c:644
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z '%s'\n"
 
-#: g10/g10.c:805
+#: g10/g10.c:824
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nie jest poprawn╠ nazw╠ zestawu znakСw\n"
 
-#: g10/g10.c:852 g10/g10.c:864
+#: g10/g10.c:872 g10/g10.c:884
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj╠cy jest niepoprawny\n"
 
-#: g10/g10.c:858 g10/g10.c:870
+#: g10/g10.c:878 g10/g10.c:890
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm geenracji skrСtСw wiadomo╤ci jest niepoprawny\n"
 
-#: g10/g10.c:874
+#: g10/g10.c:894
 msgid "the given policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:877
+#: g10/g10.c:897
 #, 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:879
+#: g10/g10.c:899
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto╤Ф completes-needed musi byФ wiЙksza od 0\n"
 
-#: g10/g10.c:881
+#: g10/g10.c:901
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto╤Ф marginals-needed musi byФ wiЙksza od 1\n"
 
-#: g10/g10.c:883
+#: g10/g10.c:903
 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:886
+#: g10/g10.c:906
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:890
+#: g10/g10.c:910
 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:967
+#: g10/g10.c:987
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Inicjowanie Bazy Zaufania nie powiodЁo siЙ: %s\n"
 
-#: g10/g10.c:973
+#: g10/g10.c:993
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:980
+#: g10/g10.c:1000
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:988
+#: g10/g10.c:1008
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:1001
+#: g10/g10.c:1021
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1034
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:1028
+#: g10/g10.c:1048
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:1040
+#: g10/g10.c:1060
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:1049
-msgid "--edit-key username [commands]"
+#: g10/g10.c:1068
+msgid "--sign-key user-id"
+msgstr ""
+
+#: g10/g10.c:1076
+#, fuzzy
+msgid "--lsign-key user-id"
+msgstr "--delete-key nazwa u©ytkownika"
+
+#: g10/g10.c:1084
+#, fuzzy
+msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u©ytkownika [polecenia]"
 
-#: g10/g10.c:1063
-msgid "--delete-secret-key username"
+#: g10/g10.c:1100
+#, fuzzy
+msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key nazwa u©ytkownika"
 
-#: g10/g10.c:1066
-msgid "--delete-key username"
+#: g10/g10.c:1103
+#, fuzzy
+msgid "--delete-key user-id"
 msgstr "--delete-key nazwa u©ytkownika"
 
-#: g10/encode.c:231 g10/g10.c:1090 g10/sign.c:366
+#: g10/encode.c:231 g10/g10.c:1127 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nie mogЙ otworzyФ %s: %s\n"
 
-#: g10/g10.c:1101
+#: g10/g10.c:1138
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbiСr kluczy]"
 
-#: g10/g10.c:1162
+#: g10/g10.c:1199
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "usuniЙcie opakowania ASCII nie powiodЁo siЙ: %s\n"
 
-#: g10/g10.c:1170
+#: g10/g10.c:1207
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiodЁo siЙ: %s\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1275
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niewЁa╤ciwy algorytm skrСtu '%s'\n"
 
-#: g10/g10.c:1317
+#: g10/g10.c:1356
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:1321
+#: g10/g10.c:1360
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj╠ wiadomo╤Ф ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1324 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1363 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mogЙ otworzyФ '%s'\n"
 
-#: g10/g10.c:1493
+#: g10/g10.c:1532
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/g10.c:1499
+#: g10/g10.c:1538
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1505
+#: g10/g10.c:1544
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1513
+#: g10/g10.c:1552
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
@@ -868,7 +896,12 @@ msgstr ""
 "znak kodowania quoted-printable w opakowaniu ASCII - prawdopodobnie\n"
 "przekЁamanie wprowadzone przez program transportowy poczty\n"
 
-#: g10/pkclist.c:137
+#. a string with valid answers
+#: g10/pkclist.c:140
+msgid "sSmMqQ"
+msgstr "iIpPwW"
+
+#: g10/pkclist.c:144
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -877,7 +910,7 @@ msgstr ""
 "Brak warto╤ci zaufania dla %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:147
+#: g10/pkclist.c:154
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -900,28 +933,23 @@ msgstr ""
 " 4 = W peЁni mu ufam.\n"
 " i = potrzebujЙ wiЙcej informacji\n"
 
-#: g10/pkclist.c:156
+#: g10/pkclist.c:163
 msgid " m = back to the main menu\n"
 msgstr " p = powrСt do gЁСwnego menu\n"
 
-#: g10/pkclist.c:158
+#: g10/pkclist.c:165
 msgid " q = quit\n"
 msgstr "w = wyj╤cie\n"
 
-#. a string with valid answers
-#: g10/pkclist.c:163
-msgid "sSmMqQ"
-msgstr "iIpPwW"
-
-#: g10/pkclist.c:167
+#: g10/pkclist.c:171
 msgid "Your decision? "
 msgstr "Twoja decyzja? "
 
-#: g10/pkclist.c:187
+#: g10/pkclist.c:193
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certyfikaty prowadz╠ce do ostatecznie zaufanego klucza:\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:264
 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"
@@ -931,7 +959,7 @@ msgstr ""
 "Sprawd╪my czy mo©na przypisaФ brakuj╠ce warto╤ci zaufania.\n"
 "\n"
 
-#: g10/pkclist.c:262
+#: g10/pkclist.c:270
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
@@ -939,7 +967,7 @@ msgstr ""
 "Brak ╤cie©ki prowadz╠cej do ktСrego╤ z naszych kluczy.\n"
 "\n"
 
-#: g10/pkclist.c:264
+#: g10/pkclist.c:272
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
@@ -947,7 +975,7 @@ msgstr ""
 "Brak certyfikatСw o niezdefiniowanym poziomie zaufania.\n"
 "\n"
 
-#: g10/pkclist.c:266
+#: g10/pkclist.c:274
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -955,36 +983,36 @@ msgstr ""
 "Parametry zaufania nie zostaЁy zmienione.\n"
 "\n"
 
-#: g10/pkclist.c:283
+#: g10/pkclist.c:291
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "klucz %08lX: klucz zostaЁ uniewa©niony!\n"
 
-#: g10/pkclist.c:289 g10/pkclist.c:299 g10/pkclist.c:405
+#: g10/pkclist.c:297 g10/pkclist.c:307 g10/pkclist.c:413
 msgid "Use this key anyway? "
 msgstr "U©yФ tego klucza pomimo to? "
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:301
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "klucz %08lX: podklucz zostaЁ uniewa©niony!\n"
 
-#: g10/pkclist.c:323
+#: g10/pkclist.c:331
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: data wa©no╤ci klucza upЁynЙЁa\n"
 
-#: g10/pkclist.c:329
+#: g10/pkclist.c:337
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr "%08lX: brak informacji aby obliczyФ prawdopodobieЯstwo zaufania\n"
 
-#: g10/pkclist.c:343
+#: g10/pkclist.c:351
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: NIE UFAMY temu kluczowi\n"
 
-#: g10/pkclist.c:349
+#: g10/pkclist.c:357
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -993,16 +1021,16 @@ msgstr ""
 "%08lX: Nie ma pewno╤Фi ©e ten klucz faktycznie nale©y do odoby podaj╠cej\n"
 "siЙ za jego wЁa╤ciciela, ale jest akceptowalny.\n"
 
-#: g10/pkclist.c:355
+#: g10/pkclist.c:363
 msgid "This key probably belongs to the owner\n"
 msgstr ""
 "Ten klucz prawdopodobnie nale©y do osoby podaj╠cej siЙ za jego wЁa╤ciciela.\n"
 
-#: g10/pkclist.c:360
+#: g10/pkclist.c:368
 msgid "This key belongs to us\n"
 msgstr "Ten klucz nale©y do nas\n"
 
-#: g10/pkclist.c:400
+#: g10/pkclist.c:408
 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"
@@ -1013,67 +1041,67 @@ msgstr ""
 "wЁa╤ciciela. Je╤li nie masz co do tego ©adnych w╠tpliwo╤ci i *naprawdЙ*\n"
 "wiesz co robisz mo©esz odpowiedzieФ \"tak\" na nastЙpne pytanie.\n"
 
-#: g10/pkclist.c:413 g10/pkclist.c:435
+#: g10/pkclist.c:421 g10/pkclist.c:443
 msgid "WARNING: Using untrusted key!\n"
 msgstr "OSTRZE╞ENIE: u©ywany jest klucz nie obdarzony zaufaniem!\n"
 
-#: g10/pkclist.c:456
+#: g10/pkclist.c:464
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "OSTRZE╞ENIE: Ten klucz zostaЁ uniewa©niony przez wЁa╤ciciela!\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:465
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         To mo©e oznaczaФ ©e podpis jest faЁszerstwem.\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:469
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "OSTRZE╞ENIE: Ten podklucz zostaЁ uniewa©niony przez wЁa╤ciciela!\n"
 
-#: g10/pkclist.c:482
+#: g10/pkclist.c:490
 msgid "Note: This key has expired!\n"
 msgstr "Uwaga: Data wa©no╤ci tego klucza upЁynЙЁa!\n"
 
-#: g10/pkclist.c:489
+#: g10/pkclist.c:497
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "OSTRZE╞ENIE: Ten klucz nie jest po╤wiadczony zaufanym podpisem!\n"
 
-#: g10/pkclist.c:491
+#: g10/pkclist.c:499
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "          Nic nie wskazuje na to ©e ten podpis zЁo©yЁ wЁa╤ciciel klucza.\n"
 
-#: g10/pkclist.c:507
+#: g10/pkclist.c:515
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "OSTRZE╞ENIE: NIE UFAMY temu kluczowi!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:516
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Ten podpis prawdopodobnie jest FAёSZERSTWEM.\n"
 
-#: g10/pkclist.c:515
+#: g10/pkclist.c:523
 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"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:526
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "         Nie ma pewno╤ci ©e ten podpis zostaЁ zЁo©nony przez wЁa╤ciciela.\n"
 
-#: g10/pkclist.c:582 g10/pkclist.c:604 g10/pkclist.c:670 g10/pkclist.c:715
+#: g10/pkclist.c:627 g10/pkclist.c:649 g10/pkclist.c:758 g10/pkclist.c:803
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: pominiЙty: %s\n"
 
-#: g10/pkclist.c:590 g10/pkclist.c:697
+#: g10/pkclist.c:635 g10/pkclist.c:785
 #, fuzzy, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: problem przy odczycie bloku klucza: %s\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:662
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1081,30 +1109,34 @@ msgstr ""
 "Nie podaЁe╤ identyfikatora u©ytkownika (user ID). \n"
 "Mo©na to zrobiФ za pomoc╠ opcji \"-r\".\n"
 
-#: g10/pkclist.c:618
+#: g10/pkclist.c:672
 msgid "Enter the user ID: "
 msgstr "Wprowad╪ identyfikator u©ytkownika (user ID): "
 
-#: g10/pkclist.c:629
+#: g10/pkclist.c:684
 msgid "No such user ID.\n"
 msgstr "Brak takiego identyfikatora u©ytkownika.\n"
 
-#: g10/pkclist.c:639
+#: g10/pkclist.c:704
 #, fuzzy
 msgid "Public key is disabled.\n"
 msgstr "klucz publiczny %08lX\n"
 
-#: g10/pkclist.c:678
+#: g10/pkclist.c:733
+msgid "unknown default recipient `s'\n"
+msgstr ""
+
+#: g10/pkclist.c:766
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: bЁ╠d podczas sprawdzania klucza: %s\n"
 
-#: g10/pkclist.c:683
+#: g10/pkclist.c:771
 #, fuzzy, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: problem przy odczycie bloku klucza: %s\n"
 
-#: g10/pkclist.c:721
+#: g10/pkclist.c:809
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adresСw\n"
 
@@ -1500,241 +1532,241 @@ msgstr "zbyt wiele wpisСw w buforze nieznanych kluczy - wyЁ╠czony\n"
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "u©ywany jest podklucz %08lX zamiast klucza gЁСwnego %08lX\n"
 
-#: g10/import.c:116
+#: g10/import.c:117
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo©na otworzyФ %s: %s\n"
 
-#: g10/import.c:160
+#: g10/import.c:161
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "pomijam blok typu %d\n"
 
-#: g10/import.c:167 g10/trustdb.c:1658 g10/trustdb.c:1697
+#: g10/import.c:168 g10/trustdb.c:1658 g10/trustdb.c:1697
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu kluczy przetworzonych do tej chwili\n"
 
-#: g10/import.c:172
+#: g10/import.c:173
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "bЁ╠d odczytu '%s': %s\n"
 
-#: g10/import.c:175
+#: g10/import.c:176
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "OgСЁem przetworzonych kluczy: %lu\n"
 
-#: g10/import.c:177
+#: g10/import.c:178
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identyfikatora: %lu\n"
 
-#: g10/import.c:179
+#: g10/import.c:180
 #, c-format
 msgid "              imported: %lu"
 msgstr "         doЁ╠czono do zbioru: %lu"
 
-#: g10/import.c:185
+#: g10/import.c:186
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   bez zmian: %lu\n"
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nowych identyfikatorСw: %lu\n"
 
-#: g10/import.c:189
+#: g10/import.c:190
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "            nowych podkluczy: %lu\n"
 
-#: g10/import.c:191
+#: g10/import.c:192
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "             nowych podpisСw: %lu\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nowych uniewa©nieЯ kluczy: %lu\n"
 
-#: g10/import.c:195
+#: g10/import.c:196
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   tajnych kluczy wczytanych: %lu\n"
 
-#: g10/import.c:197
+#: g10/import.c:198
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "     tajnych kluczy dodanych: %lu\n"
 
-#: g10/import.c:199
+#: g10/import.c:200
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    tajnych kluczy bez zmian: %lu\n"
 
-#: g10/import.c:342 g10/import.c:526
+#: g10/import.c:361 g10/import.c:550
 #, c-format
 msgid "key %08lX: no user id\n"
 msgstr "klucz %08lX: brak identyfikatora u©ytkownika\n"
 
-#: g10/import.c:353
+#: g10/import.c:372
 #, c-format
 msgid "key %08lX: no valid user ids\n"
 msgstr "klucz %08lX: brak poprawnych identyfikatorСw u©ytkownika\n"
 
-#: g10/import.c:355
+#: g10/import.c:374
 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:366 g10/import.c:593
+#: g10/import.c:385 g10/import.c:617
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 
-#: g10/import.c:372
+#: g10/import.c:391
 msgid "no default public keyring\n"
 msgstr "brak domy╤lnego zbioru kluczy publicznych\n"
 
-#: g10/import.c:376 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
+#: g10/import.c:395 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: g10/import.c:379 g10/import.c:432 g10/import.c:541 g10/import.c:642
+#: g10/import.c:398 g10/import.c:456 g10/import.c:565 g10/import.c:666
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "nie mo©na zablokowaФ zbioru kluczy publicznych '%s': %s\n"
 
-#: g10/import.c:382 g10/import.c:435 g10/import.c:544 g10/import.c:645
+#: g10/import.c:401 g10/import.c:459 g10/import.c:568 g10/import.c:669
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "bЁ╠d zapisu zbioru kluczy '%s': %s\n"
 
-#: g10/import.c:387
+#: g10/import.c:406
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "klucz %08lX: klucz publiczny wczytany do zbioru\n"
 
-#: g10/import.c:399
+#: g10/import.c:423
 #, 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:408 g10/import.c:601
+#: g10/import.c:432 g10/import.c:625
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:414 g10/import.c:607
+#: g10/import.c:438 g10/import.c:631
 #, 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:441
+#: g10/import.c:465
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
 msgstr "klucz %08lX: 1 nowy identyfikator u©ytkownika\n"
 
-#: g10/import.c:444
+#: g10/import.c:468
 #, c-format
 msgid "key %08lX: %d new user-ids\n"
 msgstr "klucz %08lX: %d nowych identyfikatorСw u©ytkownika\n"
 
-#: g10/import.c:447
+#: g10/import.c:471
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "klucz %08lX: 1 nowy podpis\n"
 
-#: g10/import.c:450
+#: g10/import.c:474
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "klucz %08lX: %d nowych podpisСw\n"
 
-#: g10/import.c:453
+#: g10/import.c:477
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "klucz %08lX: 1 nowy podklucz\n"
 
-#: g10/import.c:456
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "klucz %08lX: %d nowych podkluczy\n"
 
-#: g10/import.c:466
+#: g10/import.c:490
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "klucz %08lX: bez zmian\n"
 
-#: g10/import.c:549
+#: g10/import.c:573
 #, 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:553
+#: g10/import.c:577
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "Klucz %08lX: ten klucz ju© znajduje siЙ w zbiorze\n"
 
-#: g10/import.c:558
+#: g10/import.c:582
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "klucz %08lX: brak klucza tajnego: %s\n"
 
-#: g10/import.c:587
+#: g10/import.c:611
 #, 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:618
+#: g10/import.c:642
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "klucz %08lX: niepoprawny certyfikat uniewa©nienia:\n"
 "%s - odrzucony\n"
 
-#: g10/import.c:650
+#: g10/import.c:674
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "klucz %08lX: wczytany certyfikat uniewa©nienia\n"
 
-#: g10/import.c:683
+#: g10/import.c:707
 #, c-format
 msgid "key %08lX: no user-id for signature\n"
 msgstr "klucz %08lX: brak identyfikatora u©ytkownika do podpisu\n"
 
-#: g10/import.c:690 g10/import.c:714
+#: g10/import.c:714 g10/import.c:738
 #, 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:691
+#: g10/import.c:715
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "klucz %08lX: niepoprawny podpis wЁa╤ciciela klucza\n"
 
-#: g10/import.c:706
+#: g10/import.c:730
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "klucz %08lX: brak podklucza do dowi╠zania\n"
 
-#: g10/import.c:715
+#: g10/import.c:739
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "klucz %08lX: niepoprawne dowi╠zanie podklucza\n"
 
-#: g10/import.c:747
+#: g10/import.c:771
 #, c-format
 msgid "key %08lX: skipped userid '"
 msgstr "klucz %08lX: zostaЁ pominiЙty identyfikator u©ytkownika '"
 
-#: g10/import.c:770
+#: g10/import.c:794
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "klucz %08lX: podklucz pominiЙty\n"
@@ -1743,34 +1775,34 @@ msgstr "klucz %08lX: podklucz pominiЙty\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:795
+#: g10/import.c:819
 #, 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:804
+#: g10/import.c:828
 #, 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:812
+#: g10/import.c:836
 #, 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:912
+#: g10/import.c:936
 #, 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:963
+#: g10/import.c:987
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "klucz %08lX: dodany certyfikat uniewa©nienia\n"
 
-#: g10/import.c:1076 g10/import.c:1131
+#: g10/import.c:1100 g10/import.c:1155
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "klucz %08lX: dostЙpna kopia nie jest podpisana ni╠ sam╠\n"
@@ -1857,7 +1889,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Na pewno podpisaФ? "
 
-#: g10/keyedit.c:370 g10/keyedit.c:1806 g10/keyedit.c:1855 g10/sign.c:128
+#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:128
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "zЁo©enie podpisu nie powiodЁo siЙ: %s\n"
@@ -1899,395 +1931,395 @@ msgstr "Czy na pewno chcesz to zrobiФ? "
 msgid "moving a key signature to the correct place\n"
 msgstr "przenoszЙ podpis klucza na wЁa╤ciwe miejsce\n"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:564
 msgid "quit this menu"
 msgstr "wyj╤cie z tego menu"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:565
 msgid "q"
 msgstr "w"
 
-#: g10/keyedit.c:563
+#: g10/keyedit.c:566
 msgid "save"
 msgstr "zapis"
 
-#: g10/keyedit.c:563
+#: g10/keyedit.c:566
 msgid "save and quit"
 msgstr "zapis zmian i wyj╤cie"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:567
 msgid "help"
 msgstr "pomoc"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:567
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:569
 msgid "fpr"
 msgstr "odc"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:569
 msgid "show fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:567
+#: g10/keyedit.c:570
 msgid "list"
 msgstr "lista"
 
-#: g10/keyedit.c:567
+#: g10/keyedit.c:570
 msgid "list key and user ids"
 msgstr "lista kluczy i identyfikatorСw u©ytkownikСw"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:571
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:572
 msgid "uid"
 msgstr "id"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:572
 msgid "select user id N"
 msgstr "wybСr identyfikatora u©ytkownika N"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:573
 msgid "key"
 msgstr "klucz"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:573
 msgid "select secondary key N"
 msgstr "wybСr podklucza N"
 
-#: g10/keyedit.c:571
+#: g10/keyedit.c:574
 msgid "check"
 msgstr "lista"
 
-#: g10/keyedit.c:571
+#: g10/keyedit.c:574
 msgid "list signatures"
 msgstr "lista podpisСw"
 
-#: g10/keyedit.c:572
+#: g10/keyedit.c:575
 msgid "c"
 msgstr "l"
 
-#: g10/keyedit.c:573
+#: g10/keyedit.c:576
 msgid "sign"
 msgstr "podpis"
 
-#: g10/keyedit.c:573
+#: g10/keyedit.c:576
 msgid "sign the key"
 msgstr "zЁo©enie podpisu na kluczu"
 
-#: g10/keyedit.c:574
+#: g10/keyedit.c:577
 msgid "s"
 msgstr "p"
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:578
 msgid "lsign"
 msgstr "lpodpis"
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:578
 msgid "sign the key locally"
 msgstr "zЁo©enie lokalnego podpisu na kluczu"
 
-#: g10/keyedit.c:576
+#: g10/keyedit.c:579
 msgid "debug"
 msgstr "╤ledzenia"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:580
 msgid "adduid"
 msgstr "dodid"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:580
 msgid "add a user id"
 msgstr "dodanie nowego identyfikatora u©ytkownika do klucza"
 
-#: g10/keyedit.c:578
+#: g10/keyedit.c:581
 msgid "deluid"
 msgstr "usid"
 
-#: g10/keyedit.c:578
+#: g10/keyedit.c:581
 msgid "delete user id"
 msgstr "usuniЙcie identyfikatora u©ytkownika z klucza"
 
-#: g10/keyedit.c:579
+#: g10/keyedit.c:582
 msgid "addkey"
 msgstr "dodkl"
 
-#: g10/keyedit.c:579
+#: g10/keyedit.c:582
 msgid "add a secondary key"
 msgstr "dodanie podklucza"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:583
 msgid "delkey"
 msgstr "uskl"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:583
 msgid "delete a secondary key"
 msgstr "usuniЙcie podklucza"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:584
 #, fuzzy
 msgid "delsig"
 msgstr "lpodpis"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:584
 #, fuzzy
 msgid "delete signatures"
 msgstr "lista podpisСw"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:585
 msgid "expire"
 msgstr "data"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:585
 msgid "change the expire date"
 msgstr "zmiana daty wa©no╤ci klucza"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:586
 msgid "toggle"
 msgstr "przeЁ"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:586
 msgid "toggle between secret and public key listing"
 msgstr "przeЁ╠czenie pomiЙdzy list╠ kluczy publicznych i tajnych"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:588
 msgid "t"
 msgstr "p"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:589
 msgid "pref"
 msgstr "opcje"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:589
 msgid "list preferences"
 msgstr "lista opcji"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:590
 msgid "passwd"
 msgstr "hasЁo"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:590
 msgid "change the passphrase"
 msgstr "zmiana wyra©enia przej╤ciowego (hasЁa)"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 msgid "trust"
 msgstr "zaufanie"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 msgid "change the ownertrust"
 msgstr "zmiana zaufania wЁa╤ciciela"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:592
 msgid "revsig"
 msgstr "unpod"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:592
 msgid "revoke signatures"
 msgstr "uniewa©nienie podpisu"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:593
 msgid "revkey"
 msgstr "unpkl"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:593
 msgid "revoke a secondary key"
 msgstr "uniewa©nienie podklucza"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:594
 msgid "disable"
 msgstr ""
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:594
 #, fuzzy
 msgid "disable a key"
 msgstr "klucz niepoprawny"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:595
 msgid "enable"
 msgstr ""
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:595
 #, fuzzy
 msgid "enable a key"
 msgstr "klucz niepoprawny"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:614
 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:640
+#. fixme: check that they both match
+#: g10/keyedit.c:652
 msgid "Secret key is available.\n"
 msgstr "DostЙpny jest klucz tajny.\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:681
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:711
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:718
-msgid "Save changes? "
-msgstr "ZapisaФ zmiany? "
-
-#: g10/keyedit.c:721
-msgid "Quit without saving? "
-msgstr "Wyj╤Ф bez zapisania zmian? "
-
-#: g10/keyedit.c:731
-#, c-format
-msgid "update failed: %s\n"
-msgstr "naniesienie poprawek nie powiodЁo siЙ: %s\n"
-
-#: g10/keyedit.c:738
-#, c-format
-msgid "update secret failed: %s\n"
-msgstr "naniesienie poprawek na kluczu tajnym nie powiodЁo siЙ: %s\n"
-
-#: g10/keyedit.c:745
-msgid "Key not changed so no update needed.\n"
-msgstr ""
-"Klucz nie zostaЁ zmieniony wiЙc nanoszenie poprawek nie jest konieczne.\n"
-
-#: g10/keyedit.c:748 g10/keyedit.c:807
-#, c-format
-msgid "update of trustdb failed: %s\n"
-msgstr "naniesienie poprawek bazy zaufania nie powiodЁo siЙ: %s\n"
-
-#: g10/keyedit.c:781
+#: g10/keyedit.c:758
 msgid "Really sign all user ids? "
 msgstr "PodpisaФ wszystkie identyfikatory u©ytkownika na tym kluczu? "
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:759
 msgid "Hint: Select the user ids to sign\n"
 msgstr "Podpowied╪: wybierz identyfikatory u©ytkownika do podpisania.\n"
 
-#: g10/keyedit.c:818 g10/keyedit.c:839
+#: g10/keyedit.c:786 g10/keyedit.c:968
+#, c-format
+msgid "update of trustdb failed: %s\n"
+msgstr "naniesienie poprawek bazy zaufania nie powiodЁo siЙ: %s\n"
+
+#: g10/keyedit.c:797 g10/keyedit.c:818
 msgid "You must select at least one user id.\n"
 msgstr "Musisz wybraФ co najmniej jeden identyfikator u©ytkownika.\n"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:799
 msgid "You can't delete the last user id!\n"
 msgstr "Nie mo©esz usun╠Ф ostatniego identyfikatora u©ytkownika!\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:802
 msgid "Really remove all selected user ids? "
 msgstr "Czy na pewno usun╠Ф wszystkie wybrane identyfikatory u©ytkownika? "
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:803
 msgid "Really remove this user id? "
 msgstr "Czy na pewno usun╠Ф ten identyfikator u©ytkownika? "
 
-#: g10/keyedit.c:860 g10/keyedit.c:882
+#: g10/keyedit.c:839 g10/keyedit.c:861
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybraФ co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:864
+#: g10/keyedit.c:843
 msgid "Do you really want to delete the selected keys? "
 msgstr "Czy na pewno chcesz usun╠Ф wybrane klucze? "
 
-#: g10/keyedit.c:865
+#: g10/keyedit.c:844
 msgid "Do you really want to delete this key? "
 msgstr "Czy na pewno chcesz usun╠Ф ten klucz? "
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:865
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Czy na pewno chcesz uniewa©niФ wybrane klucze? "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:866
 msgid "Do you really want to revoke this key? "
 msgstr "Czy na pewno chcesz uniewa©niФ ten klucz? "
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:932
+msgid "Save changes? "
+msgstr "ZapisaФ zmiany? "
+
+#: g10/keyedit.c:935
+msgid "Quit without saving? "
+msgstr "Wyj╤Ф bez zapisania zmian? "
+
+#: g10/keyedit.c:946
+#, c-format
+msgid "update failed: %s\n"
+msgstr "naniesienie poprawek nie powiodЁo siЙ: %s\n"
+
+#: g10/keyedit.c:953
+#, c-format
+msgid "update secret failed: %s\n"
+msgstr "naniesienie poprawek na kluczu tajnym nie powiodЁo siЙ: %s\n"
+
+#: g10/keyedit.c:960
+msgid "Key not changed so no update needed.\n"
+msgstr ""
+"Klucz nie zostaЁ zmieniony wiЙc nanoszenie poprawek nie jest konieczne.\n"
+
+#: g10/keyedit.c:975
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (sprСbuj \"help\")\n"
 
-#: g10/keyedit.c:1039
+#: g10/keyedit.c:1065
 #, fuzzy
 msgid "This key has been disabled"
 msgstr "Uwaga: Data wa©no╤ci tego klucza upЁynЙЁa!\n"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1336
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1340
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1344
 #, fuzzy
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Na pewno utworzyФ certyfikaty uniewa©nienia ? (t/N)"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1350
 #, fuzzy
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno utworzyФ certyfikaty uniewa©nienia ? (t/N)"
 
-#: g10/keyedit.c:1338
+#: g10/keyedit.c:1364
 #, fuzzy, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d niepoprawnych podpisСw\n"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1365
 #, fuzzy, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d niepoprawnych podpisСw\n"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1368
 #, fuzzy
 msgid "Nothing deleted.\n"
 msgstr "OSTRZE╞ENIE: nic nie zostaЁo wyeksportowane!\n"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1437
 msgid "Please remove selections from the secret keys.\n"
 msgstr "ProszЙ usun╠Ф znacznik wyboru z kluczy tajnych.\n"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1443
 msgid "Please select at most one secondary key.\n"
 msgstr "ProszЙ wybraФ najwy©ej jeden podklucz.\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Zmiana daty wa©no╤ci podklucza.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1449
 #, fuzzy
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa©no╤ci gЁСwnego klucza.\n"
 
-#: g10/keyedit.c:1464
+#: g10/keyedit.c:1490
 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:1480
+#: g10/keyedit.c:1506
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj╠cego podpisu w zbiorze kluczy tajnych\n"
 
-#: g10/keyedit.c:1540
+#: g10/keyedit.c:1566
 #, c-format
 msgid "No user id with index %d\n"
 msgstr "Brak identyfikatora u©ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1612
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Brak podklucza o indeksie %d\n"
 
-#: g10/keyedit.c:1684
+#: g10/keyedit.c:1710
 msgid "user ID: \""
 msgstr "Identyfikator u©ytkownika: "
 
-#: g10/keyedit.c:1687
+#: g10/keyedit.c:1713
 #, c-format
 msgid ""
 "\"\n"
@@ -2296,15 +2328,15 @@ msgstr ""
 "\"\n"
 "podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1717
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "StworzyФ certyfikat uniewa©nienia tego podpisu? (t/N)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1797
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Na pewno utworzyФ certyfikaty uniewa©nienia ? (t/N)"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1820
 msgid "no secret key\n"
 msgstr "brak klucza prywatnego\n"
 
@@ -3321,6 +3353,9 @@ msgstr "Pomoc niedostЙpna"
 msgid "No help available for `%s'"
 msgstr "Brak pomocy o '%s'"
 
+#~ msgid "print all message digests"
+#~ msgstr "wszystkie skrСty wiadomo╤ci"
+
 #~ msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n"
 #~ msgstr ""
 #~ "UWAGA: wpis podpisu %lu[%d] znajduje siЙ w li╤cie domy╤lnej %lu,\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7e615c97a..ad6f33fac 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-07-12 15:04+0200\n"
+"POT-Creation-Date: 1999-07-14 11:47+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"
@@ -38,7 +38,7 @@ msgid "yY"
 msgstr "sS"
 
 # INICIO MENU
-#: g10/keyedit.c:561 util/miscutil.c:272
+#: g10/keyedit.c:564 util/miscutil.c:272
 msgid "quit"
 msgstr "sair"
 
@@ -285,7 +285,7 @@ msgstr ""
 "para que o sistema possa coletar mais entropia!\n"
 "(SЦo necessАrios mais %d bytes)\n"
 
-#: g10/g10.c:177
+#: g10/g10.c:180
 msgid ""
 "@Commands:\n"
 " "
@@ -293,134 +293,141 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:179
+#: g10/g10.c:182
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|faz uma assinatura"
 
-#: g10/g10.c:180
+#: g10/g10.c:183
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|faz uma assinatura em texto puro"
 
-#: g10/g10.c:181
+#: g10/g10.c:184
 msgid "make a detached signature"
 msgstr "faz uma assinatura separada"
 
-#: g10/g10.c:182
+#: g10/g10.c:185
 msgid "encrypt data"
 msgstr "criptografa dados"
 
-#: g10/g10.c:183
+#: g10/g10.c:186
 msgid "encryption only with symmetric cipher"
 msgstr "criptografa apenas com criptografia simИtrica"
 
-#: g10/g10.c:184
+#: g10/g10.c:187
 msgid "store only"
 msgstr "apenas armazena"
 
-#: g10/g10.c:185
+#: g10/g10.c:188
 msgid "decrypt data (default)"
 msgstr "descriptografa dados (padrЦo)"
 
-#: g10/g10.c:186
+#: g10/g10.c:189
 msgid "verify a signature"
 msgstr "verifica uma assinatura"
 
-#: g10/g10.c:187
+#: g10/g10.c:190
 msgid "list keys"
 msgstr "lista as chaves"
 
-#: g10/g10.c:189
+#: g10/g10.c:192
 msgid "list keys and signatures"
 msgstr "lista as chaves e as assinaturas"
 
-#: g10/g10.c:190
+#: g10/g10.c:193
 msgid "check key signatures"
 msgstr "confere as assinaturas das chaves"
 
-#: g10/g10.c:191
+#: g10/g10.c:194
 msgid "list keys and fingerprints"
 msgstr "lista as chaves e as impressУes digitais"
 
-#: g10/g10.c:192
+#: g10/g10.c:195
 msgid "list secret keys"
 msgstr "lista as chaves secretas"
 
-#: g10/g10.c:193
+#: g10/g10.c:196
 msgid "generate a new key pair"
 msgstr "gera um novo par de chaves"
 
-#: g10/g10.c:194
+#: g10/g10.c:197
 msgid "remove key from the public keyring"
 msgstr "remove a chave do chaveiro pЗblico"
 
-#: g10/g10.c:195
+#: g10/g10.c:198
+#, fuzzy
+msgid "sign a key"
+msgstr "assina a chave"
+
+#: g10/g10.c:199
+#, fuzzy
+msgid "sign a key locally"
+msgstr "assina a chave localmente"
+
+#: g10/g10.c:200
 msgid "sign or edit a key"
 msgstr "assina ou edita uma chave"
 
-#: g10/g10.c:196
+#: g10/g10.c:201
 msgid "generate a revocation certificate"
 msgstr "gera um certificado de revogaГЦo"
 
-#: g10/g10.c:197
+#: g10/g10.c:202
 msgid "export keys"
 msgstr "exporta as chaves"
 
-#: g10/g10.c:198
+#: g10/g10.c:203
 msgid "export keys to a key server"
 msgstr "exporta chaves para um servidor"
 
-#: g10/g10.c:199
+#: g10/g10.c:204
 msgid "import keys from a key server"
 msgstr "importa chaves de um servidor"
 
-#: g10/g10.c:202
+#: g10/g10.c:207
 msgid "import/merge keys"
 msgstr "importa/funde as chaves"
 
-#: g10/g10.c:204
+#: g10/g10.c:209
 msgid "list only the sequence of packets"
 msgstr "lista apenas as seqЭЙncias de pacotes"
 
 # ownertrust ???
-#: g10/g10.c:206
+#: g10/g10.c:211
 msgid "export the ownertrust values"
 msgstr "exporta os valores de confianГa"
 
-#: g10/g10.c:208
+#: g10/g10.c:213
 msgid "import ownertrust values"
 msgstr "importa os valores de confianГa"
 
-#: g10/g10.c:210
-msgid "|[NAMES]|update the trust database"
+#: g10/g10.c:215
+#, fuzzy
+msgid "update the trust database"
 msgstr "|[NOMES]|atualiza o banco de dados de confiabilidade"
 
-#: g10/g10.c:212
+#: g10/g10.c:217
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMES]|confere o banco de dados de confiabilidade"
 
-#: g10/g10.c:213
+#: g10/g10.c:218
 msgid "fix a corrupted trust database"
 msgstr ""
 "conserta um banco de dados de confiabilidade\n"
 "danificado"
 
-#: g10/g10.c:214
+#: g10/g10.c:219
 msgid "De-Armor a file or stdin"
 msgstr "Retira a armadura de um arquivo ou de \"stdin\""
 
-#: g10/g10.c:215
+#: g10/g10.c:220
 msgid "En-Armor a file or stdin"
 msgstr "Cria armadura para um arquivo ou \"stdin\""
 
-#: g10/g10.c:216
+#: g10/g10.c:221
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprime \"digests\" de mensagens"
 
-#: g10/g10.c:217
-msgid "print all message digests"
-msgstr "imprime todos os \"digests\" de mensagens"
-
-#: g10/g10.c:223
+#: g10/g10.c:225
 msgid ""
 "@\n"
 "Options:\n"
@@ -430,168 +437,177 @@ msgstr ""
 "OpГУes:\n"
 " "
 
-#: g10/g10.c:225
+#: g10/g10.c:227
 msgid "create ascii armored output"
 msgstr "cria uma saМda com armadura ascii"
 
-#: g10/g10.c:226
+#: g10/g10.c:228
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografa para NOME"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
+#, fuzzy
+msgid "|NAME|use NAME as default recipient"
+msgstr "|NOME|usa NOME como chave secreta padrЦo"
+
+#: g10/g10.c:233
+msgid "use the default key as default recipient"
+msgstr ""
+
+#: g10/g10.c:237
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usa este identificador de usuАrio para assinar\n"
 "ou descriptografar"
 
-#: g10/g10.c:231
+#: g10/g10.c:238
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|estabelece nМvel de compressЦo N (0 desabilita)"
 
-#: g10/g10.c:233
+#: g10/g10.c:240
 msgid "use canonical text mode"
 msgstr "usa modo de texto canТnico"
 
-#: g10/g10.c:234
+#: g10/g10.c:241
 msgid "use as output file"
 msgstr "usa como arquivo de saМda"
 
-#: g10/g10.c:235
+#: g10/g10.c:242
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:236
+#: g10/g10.c:243
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:237
+#: g10/g10.c:244
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: g10/g10.c:238
+#: g10/g10.c:245
 msgid "force v3 signatures"
 msgstr "forГa assinaturas v3"
 
-#: g10/g10.c:239
+#: g10/g10.c:246
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: g10/g10.c:240
+#: g10/g10.c:247
 msgid "do not make any changes"
 msgstr "nЦo fazer alteraГУes"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:242
+#: g10/g10.c:249
 msgid "batch mode: never ask"
 msgstr "modo nЦo-interativo: nunca perguntar"
 
-#: g10/g10.c:243
+#: g10/g10.c:250
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:244
+#: g10/g10.c:251
 msgid "assume no on most questions"
 msgstr "assumir nЦo para a maioria das perguntas"
 
-#: g10/g10.c:245
+#: g10/g10.c:252
 msgid "add this keyring to the list of keyrings"
 msgstr "adiciona este chaveiro Ю lista de chaveiros"
 
-#: g10/g10.c:246
+#: g10/g10.c:253
 msgid "add this secret keyring to the list"
 msgstr "adiciona este chaveiro secreto Ю lista"
 
-#: g10/g10.c:247
+#: g10/g10.c:254
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME como chave secreta padrЦo"
 
-#: g10/g10.c:248
+#: g10/g10.c:255
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDEREгO|usa este servidor para buscar chaves"
 
-#: g10/g10.c:249
+#: g10/g10.c:256
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOME|define mapa de caracteres do terminal como NOME"
 
-#: g10/g10.c:250
+#: g10/g10.c:257
 msgid "read options from file"
 msgstr "lЙ opГУes do arquivo"
 
-#: g10/g10.c:252
+#: g10/g10.c:259
 msgid "set debugging flags"
 msgstr "define parБmetros de depuraГЦo"
 
-#: g10/g10.c:253
+#: g10/g10.c:260
 msgid "enable full debugging"
 msgstr "habilita depuraГЦo completa"
 
-#: g10/g10.c:254
+#: g10/g10.c:261
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DA|escreve informaГУes de status para o descritor\n"
 "de arquivo DA"
 
-#: g10/g10.c:255
+#: g10/g10.c:262
 msgid "do not write comment packets"
 msgstr "nЦo escreve pacotes de comentАrio"
 
-#: g10/g10.c:256
+#: g10/g10.c:263
 msgid "(default is 1)"
 msgstr "(o padrЦo И 1)"
 
-#: g10/g10.c:257
+#: g10/g10.c:264
 msgid "(default is 3)"
 msgstr "(o padrЦo И 3)"
 
-#: g10/g10.c:259
+#: g10/g10.c:266
 msgid "|FILE|load extension module FILE"
 msgstr "|ARQUIVO|carrega mСdulo de extensЦo ARQUIVO"
 
-#: g10/g10.c:260
+#: g10/g10.c:267
 msgid "emulate the mode described in RFC1991"
 msgstr "emula o modo descrito no RFC1991"
 
-#: g10/g10.c:261
+#: g10/g10.c:268
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:262
+#: g10/g10.c:269
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa frase secreta modo N"
 
-#: g10/g10.c:264
+#: g10/g10.c:271
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usa algoritmo de \"digest\" de mensagens NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:266
+#: g10/g10.c:273
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usa algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:267
+#: g10/g10.c:274
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa algoritmo de criptografia NOME"
 
-#: g10/g10.c:268
+#: g10/g10.c:275
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:269
+#: g10/g10.c:276
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa algoritmo de compressЦo N"
 
-#: g10/g10.c:270
+#: g10/g10.c:277
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina o campo keyid dos pacotes criptografados"
 
-#: g10/g10.c:271
+#: g10/g10.c:278
 msgid "|NAME=VALUE|use this notation data"
 msgstr ""
 
-#: g10/g10.c:273
+#: g10/g10.c:280
 msgid ""
 "@\n"
 "Examples:\n"
@@ -611,16 +627,16 @@ msgstr ""
 " --list-keys [nomes]        mostra chaves\n"
 " --fingerprint [nomes]      mostra impressУes digitais\n"
 
-#: g10/g10.c:353
+#: g10/g10.c:360
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:357
+#: g10/g10.c:364
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opГУes] [arquivos] (-h para ajuda)"
 
 # em cima, "check" estА como "conferir"
-#: g10/g10.c:360
+#: g10/g10.c:367
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -630,7 +646,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a operaГЦo padrЦo depende dos dados de entrada\n"
 
-#: g10/g10.c:365
+#: g10/g10.c:372
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -638,170 +654,182 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:439
+#: g10/g10.c:446
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opГУes] "
 
-#: g10/g10.c:492
+#: g10/g10.c:499
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/g10.c:626
+#: g10/g10.c:633
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de opГУes padrЦo `%s' inexistente\n"
 
-#: g10/g10.c:630
+#: g10/g10.c:637
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de opГУes `%s': %s\n"
 
-#: g10/g10.c:637
+#: g10/g10.c:644
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo opГУes de `%s'\n"
 
-#: g10/g10.c:805
+#: g10/g10.c:824
 #, 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:852 g10/g10.c:864
+#: g10/g10.c:872 g10/g10.c:884
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado nЦo И vАlido\n"
 
-#: g10/g10.c:858 g10/g10.c:870
+#: g10/g10.c:878 g10/g10.c:890
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado nЦo И vАlido\n"
 
-#: g10/g10.c:874
+#: g10/g10.c:894
 msgid "the given policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:877
+#: g10/g10.c:897
 #, 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:879
+#: g10/g10.c:899
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:881
+#: g10/g10.c:901
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:883
+#: g10/g10.c:903
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve estar na faixa 1 a 255\n"
 
-#: g10/g10.c:886
+#: g10/g10.c:906
 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:890
+#: g10/g10.c:910
 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:967
+#: g10/g10.c:987
 #, 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:973
+#: g10/g10.c:993
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:980
+#: g10/g10.c:1000
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:988
+#: g10/g10.c:1008
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1001
+#: g10/g10.c:1021
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1034
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1028
+#: g10/g10.c:1048
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:1040
+#: g10/g10.c:1060
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1049
-msgid "--edit-key username [commands]"
+#: g10/g10.c:1068
+msgid "--sign-key user-id"
+msgstr ""
+
+#: g10/g10.c:1076
+#, fuzzy
+msgid "--lsign-key user-id"
+msgstr "--delete-key nome_do_usuАrio"
+
+#: g10/g10.c:1084
+#, fuzzy
+msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nome_do_usuАrio [comandos]"
 
-#: g10/g10.c:1063
-msgid "--delete-secret-key username"
+#: g10/g10.c:1100
+#, fuzzy
+msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key nome_do_usuАrio"
 
-#: g10/g10.c:1066
-msgid "--delete-key username"
+#: g10/g10.c:1103
+#, fuzzy
+msgid "--delete-key user-id"
 msgstr "--delete-key nome_do_usuАrio"
 
-#: g10/encode.c:231 g10/g10.c:1090 g10/sign.c:366
+#: g10/encode.c:231 g10/g10.c:1127 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossМvel abrir %s: %s\n"
 
-#: g10/g10.c:1101
+#: g10/g10.c:1138
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [id_do_usuАrio] [chaveiro]"
 
-#: g10/g10.c:1162
+#: g10/g10.c:1199
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1170
+#: g10/g10.c:1207
 #, 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:1236
+#: g10/g10.c:1275
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash invАlido `%s'\n"
 
-#: g10/g10.c:1317
+#: g10/g10.c:1356
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:1321
+#: g10/g10.c:1360
 msgid "Go ahead and type your message ...\n"
 msgstr "VА em frente e digite sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1324 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1363 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossМvel abrir `%s'\n"
 
-#: g10/g10.c:1493
+#: g10/g10.c:1532
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/g10.c:1499
+#: g10/g10.c:1538
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1505
+#: g10/g10.c:1544
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1513
+#: g10/g10.c:1552
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
@@ -880,7 +908,14 @@ msgstr ""
 "caracter \"quoted printable\" na armadura  - provavelmente um MTA com bugs "
 "foi usado\n"
 
-#: g10/pkclist.c:137
+# ???
+#. a string with valid answers
+#: g10/pkclist.c:140
+#, fuzzy
+msgid "sSmMqQ"
+msgstr "sSmMqQ"
+
+#: g10/pkclist.c:144
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -889,7 +924,7 @@ msgstr ""
 "Nenhum valor de confianГa designado para %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:147
+#: g10/pkclist.c:154
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -912,30 +947,23 @@ msgstr ""
 " 4 = Eu confio completamente\n"
 " 5 = Mostrar mais informaГЦo\n"
 
-#: g10/pkclist.c:156
+#: g10/pkclist.c:163
 msgid " m = back to the main menu\n"
 msgstr " m = volta ao menu principal\n"
 
-#: g10/pkclist.c:158
+#: g10/pkclist.c:165
 msgid " q = quit\n"
 msgstr " q = sai\n"
 
-# ???
-#. a string with valid answers
-#: g10/pkclist.c:163
-#, fuzzy
-msgid "sSmMqQ"
-msgstr "sSmMqQ"
-
-#: g10/pkclist.c:167
+#: g10/pkclist.c:171
 msgid "Your decision? "
 msgstr "Sua decisЦo? "
 
-#: g10/pkclist.c:187
+#: g10/pkclist.c:193
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:264
 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"
@@ -945,13 +973,13 @@ msgstr ""
 "Vamos ver se И possМvel designar alguns valores de confianГa ausentes.\n"
 "\n"
 
-#: g10/pkclist.c:262
+#: g10/pkclist.c:270
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
 msgstr "Nenhuma rota encontrada que leve a uma de nossas chaves.\n"
 
-#: g10/pkclist.c:264
+#: g10/pkclist.c:272
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
@@ -959,7 +987,7 @@ msgstr ""
 "Nenhum certificado com confianГa indefinida encontrado.\n"
 "\n"
 
-#: g10/pkclist.c:266
+#: g10/pkclist.c:274
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -967,36 +995,36 @@ msgstr ""
 "Nenhum valor de confianГa modificado.\n"
 "\n"
 
-#: g10/pkclist.c:283
+#: g10/pkclist.c:291
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "chave %08lX: a chave foi revogada!\n"
 
-#: g10/pkclist.c:289 g10/pkclist.c:299 g10/pkclist.c:405
+#: g10/pkclist.c:297 g10/pkclist.c:307 g10/pkclist.c:413
 msgid "Use this key anyway? "
 msgstr "Usa esta chave de qualquer modo? "
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:301
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "chave %08lX: a subchave foi revogada!\n"
 
-#: g10/pkclist.c:323
+#: g10/pkclist.c:331
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: a chave expirou\n"
 
-#: g10/pkclist.c:329
+#: g10/pkclist.c:337
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr "%08lX: sem informaГЦo para calcular probabilidade de confianГa\n"
 
-#: g10/pkclist.c:343
+#: g10/pkclist.c:351
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: NСs NцO confiamos nesta chave\n"
 
-#: g10/pkclist.c:349
+#: g10/pkclist.c:357
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -1005,15 +1033,15 @@ msgstr ""
 "%08lX: NЦo se tem certeza de que esta chave realmente pertence ao dono,\n"
 "mas И aceita de qualquer modo\n"
 
-#: g10/pkclist.c:355
+#: g10/pkclist.c:363
 msgid "This key probably belongs to the owner\n"
 msgstr "Esta chave provavelmente pertence ao dono\n"
 
-#: g10/pkclist.c:360
+#: g10/pkclist.c:368
 msgid "This key belongs to us\n"
 msgstr "Esta chave pertence a nСs\n"
 
-#: g10/pkclist.c:400
+#: g10/pkclist.c:408
 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"
@@ -1025,65 +1053,65 @@ msgstr ""
 "afirmativamente Ю prСxima pergunta\n"
 "\n"
 
-#: g10/pkclist.c:413 g10/pkclist.c:435
+#: g10/pkclist.c:421 g10/pkclist.c:443
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: Usando chave nЦo confiАvel!\n"
 
-#: g10/pkclist.c:456
+#: g10/pkclist.c:464
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:465
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Isto pode significar que a assinatura И falsificada.\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:469
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:482
+#: g10/pkclist.c:490
 msgid "Note: This key has expired!\n"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/pkclist.c:489
+#: g10/pkclist.c:497
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: Esta chave nЦo estА certificada com uma assinatura confiАvel!\n"
 
-#: g10/pkclist.c:491
+#: g10/pkclist.c:499
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         NЦo hА indicaГЦo de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:507
+#: g10/pkclist.c:515
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: NСs NцO confiamos nesta chave!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:516
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         A assinatura И provavelmente uma FALSIFICAгцO.\n"
 
-#: g10/pkclist.c:515
+#: g10/pkclist.c:523
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: Esta chave nЦo estА certificada com assinaturas suficientemente\n"
 "       confiАveis!\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:526
 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:582 g10/pkclist.c:604 g10/pkclist.c:670 g10/pkclist.c:715
+#: g10/pkclist.c:627 g10/pkclist.c:649 g10/pkclist.c:758 g10/pkclist.c:803
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:590 g10/pkclist.c:697
+#: g10/pkclist.c:635 g10/pkclist.c:785
 #, fuzzy, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: erro de leitura de bloco de chaves: %s\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:662
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1091,30 +1119,34 @@ msgstr ""
 "VocЙ nЦo especificou um ID de usuАrio. (pode-se usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:618
+#: g10/pkclist.c:672
 msgid "Enter the user ID: "
 msgstr "Digite o identificador de usuАrio: "
 
-#: g10/pkclist.c:629
+#: g10/pkclist.c:684
 msgid "No such user ID.\n"
 msgstr "Identificador de usuАrio inexistente.\n"
 
-#: g10/pkclist.c:639
+#: g10/pkclist.c:704
 #, fuzzy
 msgid "Public key is disabled.\n"
 msgstr "a chave pЗblica И %08lX\n"
 
-#: g10/pkclist.c:678
+#: g10/pkclist.c:733
+msgid "unknown default recipient `s'\n"
+msgstr ""
+
+#: g10/pkclist.c:766
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: erro na verificaГЦo da chave: %s\n"
 
-#: g10/pkclist.c:683
+#: g10/pkclist.c:771
 #, fuzzy, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: erro de leitura de bloco de chaves: %s\n"
 
-#: g10/pkclist.c:721
+#: g10/pkclist.c:809
 msgid "no valid addressees\n"
 msgstr "nenhum endereГo vАlido\n"
 
@@ -1504,238 +1536,238 @@ msgstr "entradas demais no cache unk - desabilitado\n"
 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/import.c:116
+#: g10/import.c:117
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossМvel abrir `%s': %s\n"
 
-#: g10/import.c:160
+#: g10/import.c:161
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:167 g10/trustdb.c:1658 g10/trustdb.c:1697
+#: g10/import.c:168 g10/trustdb.c:1658 g10/trustdb.c:1697
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu chaves processadas atИ agora\n"
 
-#: g10/import.c:172
+#: g10/import.c:173
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/import.c:175
+#: g10/import.c:176
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "NЗmero total processado: %lu\n"
 
-#: g10/import.c:177
+#: g10/import.c:178
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de usuАrios: %lu\n"
 
-#: g10/import.c:179
+#: g10/import.c:180
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:185
+#: g10/import.c:186
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             nЦo modificados: %lu\n"
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de usuАrios: %lu\n"
 
-#: g10/import.c:189
+#: g10/import.c:190
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:191
+#: g10/import.c:192
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revogaГУes de chaves: %lu\n"
 
-#: g10/import.c:195
+#: g10/import.c:196
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:197
+#: g10/import.c:198
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:199
+#: g10/import.c:200
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas nЦo modificadas: %lu\n"
 
-#: g10/import.c:342 g10/import.c:526
+#: g10/import.c:361 g10/import.c:550
 #, c-format
 msgid "key %08lX: no user id\n"
 msgstr "chave %08lX: sem id de usuАrio\n"
 
-#: g10/import.c:353
+#: g10/import.c:372
 #, c-format
 msgid "key %08lX: no valid user ids\n"
 msgstr "chave %08lX: sem ids de usuАrios vАlidos\n"
 
-#: g10/import.c:355
+#: g10/import.c:374
 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:366 g10/import.c:593
+#: g10/import.c:385 g10/import.c:617
 #, 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:372
+#: g10/import.c:391
 msgid "no default public keyring\n"
 msgstr "sem chaveiro pЗblico padrЦo\n"
 
-#: g10/import.c:376 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
+#: g10/import.c:395 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: g10/import.c:379 g10/import.c:432 g10/import.c:541 g10/import.c:642
+#: g10/import.c:398 g10/import.c:456 g10/import.c:565 g10/import.c:666
 #, fuzzy, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "impossМvel bloquear chaveiro `%s': %s\n"
 
-#: g10/import.c:382 g10/import.c:435 g10/import.c:544 g10/import.c:645
+#: g10/import.c:401 g10/import.c:459 g10/import.c:568 g10/import.c:669
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "%s: erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/import.c:387
+#: g10/import.c:406
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "chave %08lX: chave pЗblica importada\n"
 
-#: g10/import.c:399
+#: g10/import.c:423
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chave %08lX: nЦo corresponde Ю nossa cСpia\n"
 
-#: g10/import.c:408 g10/import.c:601
+#: g10/import.c:432 g10/import.c:625
 #, 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:414 g10/import.c:607
+#: g10/import.c:438 g10/import.c:631
 #, 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:441
+#: g10/import.c:465
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
 msgstr "chave %8lX: 1 novo id de usuАrio\n"
 
-#: g10/import.c:444
+#: g10/import.c:468
 #, c-format
 msgid "key %08lX: %d new user-ids\n"
 msgstr "chave %08lX: %d novos ids de usuАrios\n"
 
-#: g10/import.c:447
+#: g10/import.c:471
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:450
+#: g10/import.c:474
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:453
+#: g10/import.c:477
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:456
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:466
+#: g10/import.c:490
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "chave %08lX: nЦo modificada\n"
 
-#: g10/import.c:549
+#: g10/import.c:573
 #, 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:553
+#: g10/import.c:577
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chave %08lX: jА existe no chaveiro secreto\n"
 
-#: g10/import.c:558
+#: g10/import.c:582
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta nЦo encontrada: %s\n"
 
-#: g10/import.c:587
+#: g10/import.c:611
 #, 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:618
+#: g10/import.c:642
 #, 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:650
+#: g10/import.c:674
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revogaГЦo importado\n"
 
-#: g10/import.c:683
+#: g10/import.c:707
 #, c-format
 msgid "key %08lX: no user-id for signature\n"
 msgstr "chave %08lX: sem id de usuАrio para assinatura\n"
 
-#: g10/import.c:690 g10/import.c:714
+#: g10/import.c:714 g10/import.c:738
 #, 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:691
+#: g10/import.c:715
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "chave %08lX: auto-assinatura invАlida\n"
 
-#: g10/import.c:706
+#: g10/import.c:730
 #, 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:715
+#: g10/import.c:739
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX: ligaГЦo de subchave invАlida\n"
 
-#: g10/import.c:747
+#: g10/import.c:771
 #, c-format
 msgid "key %08lX: skipped userid '"
 msgstr "chave %08lX: id de usuАrio ignorado '"
 
-#: g10/import.c:770
+#: g10/import.c:794
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
@@ -1744,32 +1776,32 @@ msgstr "chave %08lX: subchave ignorada\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:795
+#: g10/import.c:819
 #, 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:804
+#: g10/import.c:828
 #, 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:812
+#: g10/import.c:836
 #, 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:912
+#: g10/import.c:936
 #, 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:963
+#: g10/import.c:987
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chave %08lX: certificado de revogaГЦo adicionado\n"
 
-#: g10/import.c:1076 g10/import.c:1131
+#: g10/import.c:1100 g10/import.c:1155
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chave %08lX: nossa cСpia nЦo tem auto-assinatura\n"
@@ -1855,7 +1887,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:370 g10/keyedit.c:1806 g10/keyedit.c:1855 g10/sign.c:128
+#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:128
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -1897,400 +1929,400 @@ msgstr "VocЙ realmente quer fazer isso? "
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a assinatura da chave para o local correto\n"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:564
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:565
 msgid "q"
 msgstr "s"
 
-#: g10/keyedit.c:563
+#: g10/keyedit.c:566
 msgid "save"
 msgstr "gravar"
 
-#: g10/keyedit.c:563
+#: g10/keyedit.c:566
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:567
 msgid "help"
 msgstr "ajuda"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:567
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:569
 msgid "fpr"
 msgstr "imp"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:569
 msgid "show fingerprint"
 msgstr "mostra impressЦo digital"
 
-#: g10/keyedit.c:567
+#: g10/keyedit.c:570
 msgid "list"
 msgstr "lista"
 
-#: g10/keyedit.c:567
+#: g10/keyedit.c:570
 msgid "list key and user ids"
 msgstr "lista chave e identificaГУes de usuАrios"
 
 # ???
-#: g10/keyedit.c:568
+#: g10/keyedit.c:571
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:572
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:572
 msgid "select user id N"
 msgstr "seleciona id de usuАrio N"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:573
 msgid "key"
 msgstr "chave"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:573
 msgid "select secondary key N"
 msgstr "seleciona chave secundАria N"
 
-#: g10/keyedit.c:571
+#: g10/keyedit.c:574
 msgid "check"
 msgstr "verifica"
 
-#: g10/keyedit.c:571
+#: g10/keyedit.c:574
 msgid "list signatures"
 msgstr "lista assinaturas"
 
 # ???
-#: g10/keyedit.c:572
+#: g10/keyedit.c:575
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:573
+#: g10/keyedit.c:576
 msgid "sign"
 msgstr "assina"
 
-#: g10/keyedit.c:573
+#: g10/keyedit.c:576
 msgid "sign the key"
 msgstr "assina a chave"
 
 # ???
-#: g10/keyedit.c:574
+#: g10/keyedit.c:577
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:578
 #, fuzzy
 msgid "lsign"
 msgstr "lassina"
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:578
 msgid "sign the key locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:576
+#: g10/keyedit.c:579
 msgid "debug"
 msgstr "depura"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:580
 msgid "adduid"
 msgstr ""
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:580
 msgid "add a user id"
 msgstr "adiciona um novo id de usuАrio"
 
-#: g10/keyedit.c:578
+#: g10/keyedit.c:581
 msgid "deluid"
 msgstr ""
 
-#: g10/keyedit.c:578
+#: g10/keyedit.c:581
 msgid "delete user id"
 msgstr "remove id de usuАrio"
 
-#: g10/keyedit.c:579
+#: g10/keyedit.c:582
 msgid "addkey"
 msgstr ""
 
-#: g10/keyedit.c:579
+#: g10/keyedit.c:582
 msgid "add a secondary key"
 msgstr "adiciona nova chave secundАria"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:583
 msgid "delkey"
 msgstr ""
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:583
 msgid "delete a secondary key"
 msgstr "remove uma chave secundАria"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:584
 #, fuzzy
 msgid "delsig"
 msgstr "lassina"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:584
 #, fuzzy
 msgid "delete signatures"
 msgstr "lista assinaturas"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:585
 msgid "expire"
 msgstr "expira"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:585
 msgid "change the expire date"
 msgstr "muda a data de expiraГЦo"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:586
 msgid "toggle"
 msgstr "alterna"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:586
 msgid "toggle between secret and public key listing"
 msgstr "alterna entre listagem de chave secreta e pЗblica"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:588
 msgid "t"
 msgstr "c"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:589
 msgid "pref"
 msgstr ""
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:589
 msgid "list preferences"
 msgstr "lista preferЙncias"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:590
 msgid "passwd"
 msgstr "senha"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:590
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 msgid "trust"
 msgstr "confianca"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 msgid "change the ownertrust"
 msgstr "muda os valores de confianГa"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:592
 #, fuzzy
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:592
 msgid "revoke signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:593
 #, fuzzy
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:593
 msgid "revoke a secondary key"
 msgstr "revoga uma chave secundАria"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:594
 msgid "disable"
 msgstr ""
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:594
 #, fuzzy
 msgid "disable a key"
 msgstr "chave incorreta"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:595
 msgid "enable"
 msgstr ""
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:595
 #, fuzzy
 msgid "enable a key"
 msgstr "chave incorreta"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:614
 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:640
+#. fixme: check that they both match
+#: g10/keyedit.c:652
 msgid "Secret key is available.\n"
 msgstr "Chave secreta disponМvel.\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:681
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:711
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta И necessАria para fazer isto.\n"
 
-#: g10/keyedit.c:718
-msgid "Save changes? "
-msgstr "Salvar alteraГУes? "
-
-#: g10/keyedit.c:721
-msgid "Quit without saving? "
-msgstr "Sair sem salvar? "
-
-#: g10/keyedit.c:731
-#, c-format
-msgid "update failed: %s\n"
-msgstr "atualizaГЦo falhou: %s\n"
-
-#: g10/keyedit.c:738
-#, c-format
-msgid "update secret failed: %s\n"
-msgstr "atualizaГЦo da chave secreta falhou: %s\n"
-
-#: g10/keyedit.c:745
-msgid "Key not changed so no update needed.\n"
-msgstr "Chave nЦo alterada, nenhuma atualizaГЦo И necessАria.\n"
-
-#: g10/keyedit.c:748 g10/keyedit.c:807
-#, c-format
-msgid "update of trustdb failed: %s\n"
-msgstr "atualizaГЦo do banco de dados de confiabilidade falhou: %s\n"
-
-#: g10/keyedit.c:781
+#: g10/keyedit.c:758
 msgid "Really sign all user ids? "
 msgstr "Realmente assinar todos os ids de usuАrio? "
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:759
 msgid "Hint: Select the user ids to sign\n"
 msgstr "SugestЦo: Selecione os ids de usuАrio para assinar\n"
 
-#: g10/keyedit.c:818 g10/keyedit.c:839
+#: g10/keyedit.c:786 g10/keyedit.c:968
+#, c-format
+msgid "update of trustdb failed: %s\n"
+msgstr "atualizaГЦo do banco de dados de confiabilidade falhou: %s\n"
+
+#: g10/keyedit.c:797 g10/keyedit.c:818
 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:820
+#: g10/keyedit.c:799
 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:823
+#: g10/keyedit.c:802
 msgid "Really remove all selected user ids? "
 msgstr "Realmente remover todos os ids de usuАrio selecionados? "
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:803
 msgid "Really remove this user id? "
 msgstr "Realmente remover este id de usuАrio? "
 
-#: g10/keyedit.c:860 g10/keyedit.c:882
+#: g10/keyedit.c:839 g10/keyedit.c:861
 msgid "You must select at least one key.\n"
 msgstr "VocЙ deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:864
+#: g10/keyedit.c:843
 msgid "Do you really want to delete the selected keys? "
 msgstr "VocЙ realmente quer remover as chaves selecionadas? "
 
-#: g10/keyedit.c:865
+#: g10/keyedit.c:844
 msgid "Do you really want to delete this key? "
 msgstr "VocЙ realmente quer remover esta chave? "
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:865
 msgid "Do you really want to revoke the selected keys? "
 msgstr "VocЙ realmente quer revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:866
 msgid "Do you really want to revoke this key? "
 msgstr "VocЙ realmente quer revogar esta chave? "
 
+#: g10/keyedit.c:932
+msgid "Save changes? "
+msgstr "Salvar alteraГУes? "
+
+#: g10/keyedit.c:935
+msgid "Quit without saving? "
+msgstr "Sair sem salvar? "
+
+#: g10/keyedit.c:946
+#, c-format
+msgid "update failed: %s\n"
+msgstr "atualizaГЦo falhou: %s\n"
+
+#: g10/keyedit.c:953
+#, c-format
+msgid "update secret failed: %s\n"
+msgstr "atualizaГЦo da chave secreta falhou: %s\n"
+
+#: g10/keyedit.c:960
+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:949
+#: g10/keyedit.c:975
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando invАlido (tente \"help\")\n"
 
-#: g10/keyedit.c:1039
+#: g10/keyedit.c:1065
 #, fuzzy
 msgid "This key has been disabled"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1336
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1340
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1344
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1350
 #, fuzzy
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente gerar os certificados de revogaГЦo? (s/N)"
 
-#: g10/keyedit.c:1338
+#: g10/keyedit.c:1364
 #, fuzzy, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinaturas incorretas\n"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1365
 #, fuzzy, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas incorretas\n"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1368
 #, fuzzy
 msgid "Nothing deleted.\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1437
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as seleГУes das chaves secretas.\n"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1443
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor selecione no mАximo uma chave secundАria.\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Modificando a data de expiraГЦo para a chave secundАria.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1449
 #, fuzzy
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de expiraГЦo para a chave primАria.\n"
 
-#: g10/keyedit.c:1464
+#: g10/keyedit.c:1490
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "VocЙ nЦo pode modificar a data de expiraГЦo de uma chave v3\n"
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1506
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:1540
+#: g10/keyedit.c:1566
 #, c-format
 msgid "No user id with index %d\n"
 msgstr "Nenhum id de usuАrio com Мndice %d\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1612
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secundАria com Мndice %d\n"
 
-#: g10/keyedit.c:1684
+#: g10/keyedit.c:1710
 msgid "user ID: \""
 msgstr "Digite o identificador de usuАrio:"
 
-#: g10/keyedit.c:1687
+#: g10/keyedit.c:1713
 #, c-format
 msgid ""
 "\"\n"
@@ -2299,15 +2331,15 @@ msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1717
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Gerar um certificado de revogaГЦo para esta assinatura? (s/N)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1797
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Realmente gerar os certificados de revogaГЦo? (s/N)"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1820
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
@@ -3264,6 +3296,9 @@ msgstr "Nenhuma ajuda disponМvel"
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda disponМvel para `%s'"
 
+#~ msgid "print all message digests"
+#~ msgstr "imprime todos os \"digests\" de mensagens"
+
 #~ msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n"
 #~ msgstr ""
 #~ "NOTA: assinatura rec %lu[%d] estА na lista de sugestУes de %lu mas estА\n"
diff --git a/po/ru.po b/po/ru.po
index e2048651c..2981e785f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@
 # QingLong <qinglong@Bolizm> (couldn't send an email to let you know)
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-07-12 15:04+0200\n"
+"POT-Creation-Date: 1999-07-14 11:47+0200\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-01-26 22:08:36+0100\n"
 "From: Gregory Steuck <steuck@iname.com>\n"
@@ -44,7 +44,7 @@ msgstr "да(y)"
 msgid "yY"
 msgstr "yY"
 
-#: g10/keyedit.c:561 util/miscutil.c:272
+#: g10/keyedit.c:564 util/miscutil.c:272
 msgid "quit"
 msgstr "выход"
 
@@ -330,7 +330,7 @@ msgstr ""
 "Недостаточно случайных данных. Пожалуйста, поделайте что-нибудь, чтобы\n"
 "ОС могла набрать дополнительные случайные числа! (нужно еще %d байт)\n"
 
-#: g10/g10.c:177
+#: g10/g10.c:180
 msgid ""
 "@Commands:\n"
 " "
@@ -338,136 +338,142 @@ msgstr ""
 "@Команды:\n"
 " "
 
-#: g10/g10.c:179
+#: g10/g10.c:182
 #, fuzzy
 msgid "|[file]|make a signature"
 msgstr "|[файл]|создать подпись"
 
-#: g10/g10.c:180
+#: g10/g10.c:183
 #, fuzzy
 msgid "|[file]|make a clear text signature"
 msgstr "|[файл]|создать текстовую подпись"
 
-#: g10/g10.c:181
+#: g10/g10.c:184
 msgid "make a detached signature"
 msgstr "создать отдельную подпись"
 
-#: g10/g10.c:182
+#: g10/g10.c:185
 msgid "encrypt data"
 msgstr "зашифровать данные"
 
-#: g10/g10.c:183
+#: g10/g10.c:186
 msgid "encryption only with symmetric cipher"
 msgstr "зашифровать симметричным алгоритмом"
 
-#: g10/g10.c:184
+#: g10/g10.c:187
 msgid "store only"
 msgstr "только сохранить"
 
-#: g10/g10.c:185
+#: g10/g10.c:188
 msgid "decrypt data (default)"
 msgstr "расшифровать данные (по умолчанию)"
 
-#: g10/g10.c:186
+#: g10/g10.c:189
 msgid "verify a signature"
 msgstr "проверить подпись"
 
-#: g10/g10.c:187
+#: g10/g10.c:190
 msgid "list keys"
 msgstr "список ключей"
 
-#: g10/g10.c:189
+#: g10/g10.c:192
 msgid "list keys and signatures"
 msgstr "список ключей и подписей"
 
-#: g10/g10.c:190
+#: g10/g10.c:193
 msgid "check key signatures"
 msgstr "проверить подпись на ключе"
 
-#: g10/g10.c:191
+#: g10/g10.c:194
 msgid "list keys and fingerprints"
 msgstr "список ключей с их \"отпечатками пальцев\""
 
-#: g10/g10.c:192
+#: g10/g10.c:195
 msgid "list secret keys"
 msgstr "список секретных ключей"
 
-#: g10/g10.c:193
+#: g10/g10.c:196
 msgid "generate a new key pair"
 msgstr "сгенерировать новую пару ключей (открытый и секретный)"
 
-#: g10/g10.c:194
+#: g10/g10.c:197
 msgid "remove key from the public keyring"
 msgstr "удалить ключ со связки"
 
-#: g10/g10.c:195
+#: g10/g10.c:198
+#, fuzzy
+msgid "sign a key"
+msgstr "подписать ключ"
+
+#: g10/g10.c:199
+#, fuzzy
+msgid "sign a key locally"
+msgstr "подписать ключ"
+
+#: g10/g10.c:200
 msgid "sign or edit a key"
 msgstr "подписать или редактировать ключ"
 
-#: g10/g10.c:196
+#: g10/g10.c:201
 msgid "generate a revocation certificate"
 msgstr "сгенерировать отзывающий сертификат"
 
-#: g10/g10.c:197
+#: g10/g10.c:202
 msgid "export keys"
 msgstr "экспортировать ключи"
 
-#: g10/g10.c:198
+#: g10/g10.c:203
 msgid "export keys to a key server"
 msgstr ""
 
-#: g10/g10.c:199
+#: g10/g10.c:204
 msgid "import keys from a key server"
 msgstr ""
 
-#: g10/g10.c:202
+#: g10/g10.c:207
 msgid "import/merge keys"
 msgstr "импортировать/добавить ключи"
 
-#: g10/g10.c:204
+#: g10/g10.c:209
 msgid "list only the sequence of packets"
 msgstr "напечатать только последовательность пакетов"
 
-#: g10/g10.c:206
+#: g10/g10.c:211
 #, fuzzy
 msgid "export the ownertrust values"
 msgstr "экспортировать параметры доверия\n"
 
-#: g10/g10.c:208
+#: g10/g10.c:213
 #, fuzzy
 msgid "import ownertrust values"
 msgstr "импортировать параметры доверия\n"
 
-#: g10/g10.c:210
+#: g10/g10.c:215
 #, fuzzy
-msgid "|[NAMES]|update the trust database"
+msgid "update the trust database"
 msgstr "|[ИМЕНА]|проверить базу данных доверия"
 
-#: g10/g10.c:212
+#: g10/g10.c:217
 msgid "|[NAMES]|check the trust database"
 msgstr "|[ИМЕНА]|проверить базу данных доверия"
 
-#: g10/g10.c:213
+#: g10/g10.c:218
 msgid "fix a corrupted trust database"
 msgstr "исправить разрушенную базу данных доверия"
 
-#: g10/g10.c:214
+#: g10/g10.c:219
 msgid "De-Armor a file or stdin"
 msgstr "Декодировать stdin или файл из ASCII-представления"
 
-#: g10/g10.c:215
+#: g10/g10.c:220
 msgid "En-Armor a file or stdin"
 msgstr "Закодировать stdin или файл в ASCII-представление"
 
-#: g10/g10.c:216
+#: g10/g10.c:221
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|напечатать дайджест сообщения"
 
-#: g10/g10.c:217
-msgid "print all message digests"
-msgstr "напечатать все дайджесты сообщения"
-
-#: g10/g10.c:223
+#: g10/g10.c:225
 msgid ""
 "@\n"
 "Options:\n"
@@ -477,169 +483,178 @@ msgstr ""
 "Параметры:\n"
 " "
 
-#: g10/g10.c:225
+#: g10/g10.c:227
 msgid "create ascii armored output"
 msgstr "вывод в ASCII-представлении"
 
-#: g10/g10.c:226
+#: g10/g10.c:228
 #, fuzzy
 msgid "|NAME|encrypt for NAME"
 msgstr "|ИМЯ|использовать шифровальный алгоритмом ИМЯ"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
+#, fuzzy
+msgid "|NAME|use NAME as default recipient"
+msgstr "|ИМЯ|использовать ИМЯ в качестве секретного ключа по умолчанию"
+
+#: g10/g10.c:233
+msgid "use the default key as default recipient"
+msgstr ""
+
+#: g10/g10.c:237
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "использовать указанный идентификатор пользователя для подписи или расшифровки"
 
-#: g10/g10.c:231
+#: g10/g10.c:238
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|установить уровень сжатия (0 - не сжимать)"
 
-#: g10/g10.c:233
+#: g10/g10.c:240
 msgid "use canonical text mode"
 msgstr "использовать канонический текстовый режим"
 
-#: g10/g10.c:234
+#: g10/g10.c:241
 msgid "use as output file"
 msgstr "использовать в качестве выходного файла"
 
-#: g10/g10.c:235
+#: g10/g10.c:242
 msgid "verbose"
 msgstr "многословный"
 
-#: g10/g10.c:236
+#: g10/g10.c:243
 msgid "be somewhat more quiet"
 msgstr ""
 
-#: g10/g10.c:237
+#: g10/g10.c:244
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: g10/g10.c:238
+#: g10/g10.c:245
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "проверить подпись на ключе"
 
-#: g10/g10.c:239
+#: g10/g10.c:246
 #, fuzzy
 msgid "always use a MDC for encryption"
 msgstr "использовать указанный идентификатор пользователя для шифрования"
 
-#: g10/g10.c:240
+#: g10/g10.c:247
 msgid "do not make any changes"
 msgstr "Keine wirklichen дnderungen durchfЭhren"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:242
+#: g10/g10.c:249
 msgid "batch mode: never ask"
 msgstr "пакетный режим: ничего не спрашивать"
 
-#: g10/g10.c:243
+#: g10/g10.c:250
 msgid "assume yes on most questions"
 msgstr "отвечать \"да\" на большинство вопросов"
 
-#: g10/g10.c:244
+#: g10/g10.c:251
 msgid "assume no on most questions"
 msgstr "отвечать \"нет\" на большинство вопросов"
 
-#: g10/g10.c:245
+#: g10/g10.c:252
 msgid "add this keyring to the list of keyrings"
 msgstr "добавить эту связку к списку связок ключей"
 
-#: g10/g10.c:246
+#: g10/g10.c:253
 msgid "add this secret keyring to the list"
 msgstr "добавить эту секретную связку к списку связок ключей"
 
-#: g10/g10.c:247
+#: g10/g10.c:254
 msgid "|NAME|use NAME as default secret key"
 msgstr "|ИМЯ|использовать ИМЯ в качестве секретного ключа по умолчанию"
 
-#: g10/g10.c:248
+#: g10/g10.c:255
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: g10/g10.c:249
+#: g10/g10.c:256
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|ИМЯ|использовать шифровальный алгоритмом ИМЯ"
 
-#: g10/g10.c:250
+#: g10/g10.c:257
 msgid "read options from file"
 msgstr "читать параметры из файла"
 
-#: g10/g10.c:252
+#: g10/g10.c:259
 msgid "set debugging flags"
 msgstr "установить отладочные флаги"
 
-#: g10/g10.c:253
+#: g10/g10.c:260
 msgid "enable full debugging"
 msgstr "разрешить всю отладку"
 
-#: g10/g10.c:254
+#: g10/g10.c:261
 msgid "|FD|write status info to this FD"
 msgstr "|FD| записывать информацию о состоянии в дескриптор (FD)"
 
-#: g10/g10.c:255
+#: g10/g10.c:262
 msgid "do not write comment packets"
 msgstr "не писать пакеты с комментариями"
 
-#: g10/g10.c:256
+#: g10/g10.c:263
 msgid "(default is 1)"
 msgstr "(по умолчанию 1)"
 
-#: g10/g10.c:257
+#: g10/g10.c:264
 msgid "(default is 3)"
 msgstr "(по умолчанию 3)"
 
-#: g10/g10.c:259
+#: g10/g10.c:266
 #, fuzzy
 msgid "|FILE|load extension module FILE"
 msgstr "|ФАЙЛ|загрузить ФАЙЛ с расширяющими модулями"
 
-#: g10/g10.c:260
+#: g10/g10.c:267
 msgid "emulate the mode described in RFC1991"
 msgstr "эмулировать режим описанный в RFC1991"
 
-#: g10/g10.c:261
+#: g10/g10.c:268
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:262
+#: g10/g10.c:269
 #, fuzzy
 msgid "|N|use passphrase mode N"
 msgstr "|N|использовать ключевую фразу режима N\n"
 
-#: g10/g10.c:264
+#: g10/g10.c:271
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|ИМЯ|использовать хэш-алгоритм ИМЯ для ключевых фраз"
 
-#: g10/g10.c:266
+#: g10/g10.c:273
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ИМЯ|использовать шифровальный алгоритмом ИМЯ для ключевых фраз"
 
-#: g10/g10.c:267
+#: g10/g10.c:274
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ИМЯ|использовать шифровальный алгоритмом ИМЯ"
 
-#: g10/g10.c:268
+#: g10/g10.c:275
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|ИМЯ|использовать хэш-алгоритм ИМЯ"
 
-#: g10/g10.c:269
+#: g10/g10.c:276
 msgid "|N|use compress algorithm N"
 msgstr "|N|использовать алгоритм сжатия N"
 
-#: g10/g10.c:270
+#: g10/g10.c:277
 msgid "throw keyid field of encrypted packets"
 msgstr "выбрасывать поле keyid у зашифрованных пакетов"
 
-#: g10/g10.c:271
+#: g10/g10.c:278
 msgid "|NAME=VALUE|use this notation data"
 msgstr ""
 
-#: g10/g10.c:273
+#: g10/g10.c:280
 #, fuzzy
 msgid ""
 "@\n"
@@ -660,17 +675,17 @@ msgstr ""
 " --list-keys [names]        показать список ключей\n"
 " --fingerprint [names]      показать \"отпечатки пальцев\" ключей\n"
 
-#: g10/g10.c:353
+#: g10/g10.c:360
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Пожалуйста, отправляйте сообщения об ошибках по адресу "
 "<gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:357
+#: g10/g10.c:364
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Использование: gpg [параметры] [файлы] (-h для помощи)"
 
-#: g10/g10.c:360
+#: g10/g10.c:367
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -680,7 +695,7 @@ msgstr ""
 "подписывает, проверяет подписи, шифрует или расшифровывает\n"
 "режим работы зависит от входных данных\n"
 
-#: g10/g10.c:365
+#: g10/g10.c:372
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -688,171 +703,182 @@ msgstr ""
 "\n"
 "Поддерживаемые алгоритмы:\n"
 
-#: g10/g10.c:439
+#: g10/g10.c:446
 msgid "usage: gpg [options] "
 msgstr "Использование: gpg [параметры] "
 
-#: g10/g10.c:492
+#: g10/g10.c:499
 msgid "conflicting commands\n"
 msgstr "WidersprЭchliche Kommandos\n"
 
-#: g10/g10.c:626
+#: g10/g10.c:633
 #, fuzzy, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "замечание: файл параметров по умолчанию `%s' отсутствует\n"
 
-#: g10/g10.c:630
+#: g10/g10.c:637
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл параметров `%s': %s\n"
 
-#: g10/g10.c:637
+#: g10/g10.c:644
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "читаются параметры из `%s'\n"
 
-#: g10/g10.c:805
+#: g10/g10.c:824
 #, fuzzy, c-format
 msgid "%s is not a valid character set\n"
 msgstr "Недопустимый символ в комментарии.\n"
 
-#: g10/g10.c:852 g10/g10.c:864
+#: g10/g10.c:872 g10/g10.c:884
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран недопустимый алгоритм шифрования\n"
 
-#: g10/g10.c:858 g10/g10.c:870
+#: g10/g10.c:878 g10/g10.c:890
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбран недопустимый дайджест-алгоритм\n"
 
-#: g10/g10.c:874
+#: g10/g10.c:894
 msgid "the given policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:877
+#: g10/g10.c:897
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "алгоритм упаковки может иметь значения от %d до %d\n"
 
-#: g10/g10.c:879
+#: g10/g10.c:899
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/g10.c:881
+#: g10/g10.c:901
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/g10.c:883
+#: g10/g10.c:903
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:886
+#: g10/g10.c:906
 #, fuzzy
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "замечание: простой S2K режим (0) очень не рекомендуется\n"
 
-#: g10/g10.c:890
+#: g10/g10.c:910
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K: должен быть 0, 1 или 3\n"
 
-#: g10/g10.c:967
+#: g10/g10.c:987
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Ошибка инициализации базы данных доверия: %s\n"
 
-#: g10/g10.c:973
+#: g10/g10.c:993
 msgid "--store [filename]"
 msgstr "--store [имя файла]"
 
-#: g10/g10.c:980
+#: g10/g10.c:1000
 msgid "--symmetric [filename]"
 msgstr "--symmetric [имя файла]"
 
-#: g10/g10.c:988
+#: g10/g10.c:1008
 msgid "--encrypt [filename]"
 msgstr "--encrypt [имя файла]"
 
-#: g10/g10.c:1001
+#: g10/g10.c:1021
 msgid "--sign [filename]"
 msgstr "--sign [имя файла]"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1034
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [имя файла]"
 
-#: g10/g10.c:1028
+#: g10/g10.c:1048
 msgid "--clearsign [filename]"
 msgstr "--clearsign [имя файла]"
 
-#: g10/g10.c:1040
+#: g10/g10.c:1060
 msgid "--decrypt [filename]"
 msgstr "--decrypt [имя файла]"
 
-#: g10/g10.c:1049
+#: g10/g10.c:1068
+msgid "--sign-key user-id"
+msgstr ""
+
+#: g10/g10.c:1076
+#, fuzzy
+msgid "--lsign-key user-id"
+msgstr "--delete-key имя-пользователя"
+
+#: g10/g10.c:1084
 #, fuzzy
-msgid "--edit-key username [commands]"
+msgid "--edit-key user-id [commands]"
 msgstr "--edit-key имя-пользователя"
 
-#: g10/g10.c:1063
-msgid "--delete-secret-key username"
+#: g10/g10.c:1100
+#, fuzzy
+msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key имя-пользователя"
 
-#: g10/g10.c:1066
-msgid "--delete-key username"
+#: g10/g10.c:1103
+#, fuzzy
+msgid "--delete-key user-id"
 msgstr "--delete-key имя-пользователя"
 
-#: g10/encode.c:231 g10/g10.c:1090 g10/sign.c:366
+#: g10/encode.c:231 g10/g10.c:1127 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "невозможно открыть файл `%s': %s\n"
 
-#: g10/g10.c:1101
+#: g10/g10.c:1138
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [идентификатор пользователя] [связка ключей]"
 
-#: g10/g10.c:1162
+#: g10/g10.c:1199
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка декодирования: %s\n"
 
-#: g10/g10.c:1170
+#: g10/g10.c:1207
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка кодирования: %s\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1275
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимый хэш-алгоритм `%s'\n"
 
-#: g10/g10.c:1317
+#: g10/g10.c:1356
 msgid "[filename]"
 msgstr "[имя файла]"
 
-#: g10/g10.c:1321
+#: g10/g10.c:1360
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/decrypt.c:59 g10/g10.c:1324 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1363 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "невозможно открыть файл `%s'\n"
 
-#: g10/g10.c:1493
+#: g10/g10.c:1532
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/g10.c:1499
+#: g10/g10.c:1538
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1505
+#: g10/g10.c:1544
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1513
+#: g10/g10.c:1552
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
@@ -933,7 +959,14 @@ msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 
-#: g10/pkclist.c:137
+# valid user replies (not including 1..4)
+#. a string with valid answers
+#: g10/pkclist.c:140
+#, fuzzy
+msgid "sSmMqQ"
+msgstr "sSmMqQ"
+
+#: g10/pkclist.c:144
 #, fuzzy, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -942,7 +975,7 @@ msgstr ""
 "Не определены параметры доверия для %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:147
+#: g10/pkclist.c:154
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly\n"
@@ -967,30 +1000,23 @@ msgstr ""
 " 4 = Верю полностью\n"
 " s = Пожалуйста, покажите дополнительную информацию\n"
 
-#: g10/pkclist.c:156
+#: g10/pkclist.c:163
 msgid " m = back to the main menu\n"
 msgstr " m = обратно в главное меню\n"
 
-#: g10/pkclist.c:158
+#: g10/pkclist.c:165
 msgid " q = quit\n"
 msgstr ""
 
-# valid user replies (not including 1..4)
-#. a string with valid answers
-#: g10/pkclist.c:163
-#, fuzzy
-msgid "sSmMqQ"
-msgstr "sSmMqQ"
-
-#: g10/pkclist.c:167
+#: g10/pkclist.c:171
 msgid "Your decision? "
 msgstr "Ваше решение? "
 
-#: g10/pkclist.c:187
+#: g10/pkclist.c:193
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr ""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:264
 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"
@@ -1001,70 +1027,70 @@ msgstr ""
 "некоторые недостающие значения \"доверия владельцу\"\n"
 "\n"
 
-#: g10/pkclist.c:262
+#: g10/pkclist.c:270
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:264
+#: g10/pkclist.c:272
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:266
+#: g10/pkclist.c:274
 #, fuzzy
 msgid ""
 "No trust values changed.\n"
 "\n"
 msgstr "Значения параметров доверия не изменены.\n"
 
-#: g10/pkclist.c:283
+#: g10/pkclist.c:291
 #, fuzzy, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "build_sigrecs: ключ ist widerrufen\n"
 
-#: g10/pkclist.c:289 g10/pkclist.c:299 g10/pkclist.c:405
+#: g10/pkclist.c:297 g10/pkclist.c:307 g10/pkclist.c:413
 msgid "Use this key anyway? "
 msgstr "Все равно использовать этот ключ?"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:301
 #, fuzzy, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "build_sigrecs: ключ ist widerrufen\n"
 
-#: g10/pkclist.c:323
+#: g10/pkclist.c:331
 #, fuzzy, c-format
 msgid "%08lX: key has expired\n"
 msgstr "Замечание: Срок действия ключа уже истек!\n"
 
-#: g10/pkclist.c:329
+#: g10/pkclist.c:337
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr ""
 
-#: g10/pkclist.c:343
+#: g10/pkclist.c:351
 #, fuzzy, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "ВНИМАНИЕ: Мы НЕ доверяем этому ключу!\n"
 
-#: g10/pkclist.c:349
+#: g10/pkclist.c:357
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
 "but it is accepted anyway\n"
 msgstr ""
 
-#: g10/pkclist.c:355
+#: g10/pkclist.c:363
 msgid "This key probably belongs to the owner\n"
 msgstr ""
 
-#: g10/pkclist.c:360
+#: g10/pkclist.c:368
 msgid "This key belongs to us\n"
 msgstr ""
 
-#: g10/pkclist.c:400
+#: g10/pkclist.c:408
 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"
@@ -1075,65 +1101,65 @@ msgstr ""
 "кто указан его владельцем. Отвечайте \"да\" на следующий вопрос,\n"
 "только если вы *действительно* понимаете что делаете.\n"
 
-#: g10/pkclist.c:413 g10/pkclist.c:435
+#: g10/pkclist.c:421 g10/pkclist.c:443
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ВНИМАНИЕ: Используется ключ к которому нет доверия!\n"
 
-#: g10/pkclist.c:456
+#: g10/pkclist.c:464
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ВНИМАНИЕ: Владелец ключа уже отозвал его!\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:465
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "          Это может означать, что подпись поддельная.\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:469
 #, fuzzy
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ВНИМАНИЕ: Владелец ключа уже отозвал его!\n"
 
-#: g10/pkclist.c:482
+#: g10/pkclist.c:490
 msgid "Note: This key has expired!\n"
 msgstr "Замечание: Срок действия ключа уже истек!\n"
 
-#: g10/pkclist.c:489
+#: g10/pkclist.c:497
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "ВНИМАНИЕ: Этот ключ не заверен доверенной подписью!\n"
 
-#: g10/pkclist.c:491
+#: g10/pkclist.c:499
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Нет никаких указания на то, что ключ принадлежит его владельцу.\n"
 
-#: g10/pkclist.c:507
+#: g10/pkclist.c:515
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ВНИМАНИЕ: Мы НЕ доверяем этому ключу!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:516
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Подпись вероятно -- ПОДДЕЛКА.\n"
 
-#: g10/pkclist.c:515
+#: g10/pkclist.c:523
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "ВНИМАНИЕ: Этот ключ не заверен достаточно доверенными подписями!\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:526
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "          Нет уверенности, что подпись принадлежит владельцу.\n"
 
-#: g10/pkclist.c:582 g10/pkclist.c:604 g10/pkclist.c:670 g10/pkclist.c:715
+#: g10/pkclist.c:627 g10/pkclist.c:649 g10/pkclist.c:758 g10/pkclist.c:803
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: пропущен: %s\n"
 
-#: g10/pkclist.c:590 g10/pkclist.c:697
+#: g10/pkclist.c:635 g10/pkclist.c:785
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr ""
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:662
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1142,30 +1168,34 @@ msgstr ""
 "\"-r\").\n"
 "\n"
 
-#: g10/pkclist.c:618
+#: g10/pkclist.c:672
 msgid "Enter the user ID: "
 msgstr "Введите идентификатор пользователя: "
 
-#: g10/pkclist.c:629
+#: g10/pkclist.c:684
 msgid "No such user ID.\n"
 msgstr "Нет такого идентификатора пользователя.\n"
 
-#: g10/pkclist.c:639
+#: g10/pkclist.c:704
 #, fuzzy
 msgid "Public key is disabled.\n"
 msgstr "Открытый ключ не найден"
 
-#: g10/pkclist.c:678
+#: g10/pkclist.c:733
+msgid "unknown default recipient `s'\n"
+msgstr ""
+
+#: g10/pkclist.c:766
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: ошибка при проверке ключа: %s\n"
 
-#: g10/pkclist.c:683
+#: g10/pkclist.c:771
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr ""
 
-#: g10/pkclist.c:721
+#: g10/pkclist.c:809
 msgid "no valid addressees\n"
 msgstr "нет допустимых адресов\n"
 
@@ -1563,238 +1593,238 @@ msgstr ""
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "используется дополнительный ключ %09lX вместо основного %08lX%\n"
 
-#: g10/import.c:116
+#: g10/import.c:117
 #, fuzzy, c-format
 msgid "can't open `%s': %s\n"
 msgstr "невозможно открыть файл `%s': %s\n"
 
-#: g10/import.c:160
+#: g10/import.c:161
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "пропускаем блок типа %d\n"
 
-#: g10/import.c:167 g10/trustdb.c:1658 g10/trustdb.c:1697
+#: g10/import.c:168 g10/trustdb.c:1658 g10/trustdb.c:1697
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr ""
 
-#: g10/import.c:172
+#: g10/import.c:173
 #, fuzzy, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/import.c:175
+#: g10/import.c:176
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr ""
 
-#: g10/import.c:177
+#: g10/import.c:178
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:179
+#: g10/import.c:180
 #, c-format
 msgid "              imported: %lu"
 msgstr ""
 
-#: g10/import.c:185
+#: g10/import.c:186
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:189
+#: g10/import.c:190
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr ""
 
-#: g10/import.c:191
+#: g10/import.c:192
 #, fuzzy, c-format
 msgid "        new signatures: %lu\n"
 msgstr "ключ %08lX: %d новых подписей\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr ""
 
-#: g10/import.c:195
+#: g10/import.c:196
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr ""
 
-#: g10/import.c:197
+#: g10/import.c:198
 #, fuzzy, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "ключ %08lX: секретный ключ импортирован\n"
 
-#: g10/import.c:199
+#: g10/import.c:200
 #, fuzzy, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "Использован неправильный секретный ключ"
 
-#: g10/import.c:342 g10/import.c:526
+#: g10/import.c:361 g10/import.c:550
 #, c-format
 msgid "key %08lX: no user id\n"
 msgstr "ключ %08lX: нет идентификатора пользователя\n"
 
-#: g10/import.c:353
+#: g10/import.c:372
 #, c-format
 msgid "key %08lX: no valid user ids\n"
 msgstr "ключ %08lX: нет допустимых идентификаторов пользователей\n"
 
-#: g10/import.c:355
+#: g10/import.c:374
 msgid "this may be caused by a missing self-signature\n"
 msgstr "это может быть вызвано отсутствием само-подписи\n"
 
-#: g10/import.c:366 g10/import.c:593
+#: g10/import.c:385 g10/import.c:617
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "ключ %08lX: открытый ключ не найден: %s\n"
 
-#: g10/import.c:372
+#: g10/import.c:391
 msgid "no default public keyring\n"
 msgstr "нет связки открытых ключей по умолчанию\n"
 
-#: g10/import.c:376 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
+#: g10/import.c:395 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "записывается в `%s'\n"
 
-#: g10/import.c:379 g10/import.c:432 g10/import.c:541 g10/import.c:642
+#: g10/import.c:398 g10/import.c:456 g10/import.c:565 g10/import.c:666
 #, fuzzy, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "невозможно заблокировать связку открытых ключей: %s\n"
 
-#: g10/import.c:382 g10/import.c:435 g10/import.c:544 g10/import.c:645
+#: g10/import.c:401 g10/import.c:459 g10/import.c:568 g10/import.c:669
 #, fuzzy, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/import.c:387
+#: g10/import.c:406
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "ключ %08lX: открытый ключ импортирован\n"
 
-#: g10/import.c:399
+#: g10/import.c:423
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "ключ %08lX: не совпадает с нашей копией\n"
 
-#: g10/import.c:408 g10/import.c:601
+#: g10/import.c:432 g10/import.c:625
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "ключ %08lX: невозможно обнаружить original keyblock: %s\n"
 
-#: g10/import.c:414 g10/import.c:607
+#: g10/import.c:438 g10/import.c:631
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "ключ %08lX: невозможно прочитать original keyblock: %s\n"
 
-#: g10/import.c:441
+#: g10/import.c:465
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
 msgstr "ключ %08lX: 1 новый идентификатор пользователя\n"
 
-#: g10/import.c:444
+#: g10/import.c:468
 #, c-format
 msgid "key %08lX: %d new user-ids\n"
 msgstr "ключ %08lX: %d новых идентификаторов пользователей\n"
 
-#: g10/import.c:447
+#: g10/import.c:471
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "ключ %08lX: 1 новая подпись\n"
 
-#: g10/import.c:450
+#: g10/import.c:474
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "ключ %08lX: %d новых подписей\n"
 
-#: g10/import.c:453
+#: g10/import.c:477
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "ключ %08lX: 1 новый под-ключ\n"
 
-#: g10/import.c:456
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "ключ %08lX: %d новых под-ключей\n"
 
-#: g10/import.c:466
+#: g10/import.c:490
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "ключ %08lX: не изменен\n"
 
-#: g10/import.c:549
+#: g10/import.c:573
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "ключ %08lX: секретный ключ импортирован\n"
 
 #. we can't merge secret keys
-#: g10/import.c:553
+#: g10/import.c:577
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "ключ %08lX: уже на связке секретных ключей\n"
 
-#: g10/import.c:558
+#: g10/import.c:582
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "ключ %08lX: секретный ключ не найден: %s\n"
 
-#: g10/import.c:587
+#: g10/import.c:611
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "ключ %08lX: нет открытого ключа - невозможно применить отзывающий "
 "сертификат\n"
 
-#: g10/import.c:618
+#: g10/import.c:642
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "ключ %08lX: недопустимый отзывающий сертификат: %s - отвергнут\n"
 
-#: g10/import.c:650
+#: g10/import.c:674
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "ключ %08lX: отзывающий сертификат импортирован\n"
 
-#: g10/import.c:683
+#: g10/import.c:707
 #, c-format
 msgid "key %08lX: no user-id for signature\n"
 msgstr "ключ %08lX: нет идентификатора пользователя для подписи\n"
 
-#: g10/import.c:690 g10/import.c:714
+#: g10/import.c:714 g10/import.c:738
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "ключ %08lX: неподдерживаемый алгоритм открытого ключа\n"
 
-#: g10/import.c:691
+#: g10/import.c:715
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "ключ %08lX: недопустимая само-подпись\n"
 
-#: g10/import.c:706
+#: g10/import.c:730
 #, fuzzy, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "ключ %08lX: нет идентификатора пользователя\n"
 
-#: g10/import.c:715
+#: g10/import.c:739
 #, fuzzy, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "ключ %08lX: нет допустимых идентификаторов пользователей\n"
 
-#: g10/import.c:747
+#: g10/import.c:771
 #, c-format
 msgid "key %08lX: skipped userid '"
 msgstr "ключ %08lX: пропущен идентификатор пользователя '"
 
-#: g10/import.c:770
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "ключ %08lX: 1 новый под-ключ\n"
@@ -1803,32 +1833,32 @@ msgstr "ключ %08lX: 1 новый под-ключ\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:795
+#: g10/import.c:819
 #, fuzzy, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "ключ %08lX: отзывающий сертификат в неправильном месте - пропущен\n"
 
-#: g10/import.c:804
+#: g10/import.c:828
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "ключ %08lX: отзывающий сертификат в неправильном месте - пропущен\n"
 
-#: g10/import.c:812
+#: g10/import.c:836
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "ключ %08lX: недопустимый отзывающий сертификат: %s - пропущен\n"
 
-#: g10/import.c:912
+#: g10/import.c:936
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:963
+#: g10/import.c:987
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "ключ %08lX: отзывающий сертификат добавлен\n"
 
-#: g10/import.c:1076 g10/import.c:1131
+#: g10/import.c:1100 g10/import.c:1155
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "ключ %08lX: наша копия не имеет само-подписи\n"
@@ -1917,7 +1947,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Действительно подписать? "
 
-#: g10/keyedit.c:370 g10/keyedit.c:1806 g10/keyedit.c:1855 g10/sign.c:128
+#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:128
 #, fuzzy, c-format
 msgid "signing failed: %s\n"
 msgstr "ошибка подписывания: %s\n"
@@ -1959,436 +1989,436 @@ msgstr "Вы действительно этого хотите? "
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:564
 msgid "quit this menu"
 msgstr "выйти из меню"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:565
 msgid "q"
 msgstr ""
 
-#: g10/keyedit.c:563
+#: g10/keyedit.c:566
 msgid "save"
 msgstr "записать"
 
-#: g10/keyedit.c:563
+#: g10/keyedit.c:566
 msgid "save and quit"
 msgstr "записать и выйти"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:567
 msgid "help"
 msgstr "помощь"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:567
 msgid "show this help"
 msgstr "показать помощь"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:569
 msgid "fpr"
 msgstr ""
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:569
 #, fuzzy
 msgid "show fingerprint"
 msgstr "показать \"отпечаток пальца\""
 
-#: g10/keyedit.c:567
+#: g10/keyedit.c:570
 #, fuzzy
 msgid "list"
 msgstr "список"
 
-#: g10/keyedit.c:567
+#: g10/keyedit.c:570
 #, fuzzy
 msgid "list key and user ids"
 msgstr "список ключей и идентификаторов пользователей"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:571
 msgid "l"
 msgstr ""
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:572
 msgid "uid"
 msgstr ""
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:572
 msgid "select user id N"
 msgstr "выбрать идентификатор пользователя N"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:573
 msgid "key"
 msgstr "ключ"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:573
 msgid "select secondary key N"
 msgstr "выбрать дополнительный ключ N"
 
-#: g10/keyedit.c:571
+#: g10/keyedit.c:574
 msgid "check"
 msgstr "проверка"
 
-#: g10/keyedit.c:571
+#: g10/keyedit.c:574
 #, fuzzy
 msgid "list signatures"
 msgstr "список ключей и их подписей"
 
-#: g10/keyedit.c:572
+#: g10/keyedit.c:575
 msgid "c"
 msgstr ""
 
-#: g10/keyedit.c:573
+#: g10/keyedit.c:576
 msgid "sign"
 msgstr "подписать"
 
-#: g10/keyedit.c:573
+#: g10/keyedit.c:576
 #, fuzzy
 msgid "sign the key"
 msgstr "подписать ключ"
 
-#: g10/keyedit.c:574
+#: g10/keyedit.c:577
 msgid "s"
 msgstr ""
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:578
 #, fuzzy
 msgid "lsign"
 msgstr "подписать"
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:578
 #, fuzzy
 msgid "sign the key locally"
 msgstr "подписать ключ"
 
-#: g10/keyedit.c:576
+#: g10/keyedit.c:579
 msgid "debug"
 msgstr "отладка"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:580
 msgid "adduid"
 msgstr ""
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:580
 msgid "add a user id"
 msgstr "добавить идентификатор пользователя"
 
-#: g10/keyedit.c:578
+#: g10/keyedit.c:581
 msgid "deluid"
 msgstr ""
 
-#: g10/keyedit.c:578
+#: g10/keyedit.c:581
 #, fuzzy
 msgid "delete user id"
 msgstr "удалить идентификатор пользователя"
 
-#: g10/keyedit.c:579
+#: g10/keyedit.c:582
 msgid "addkey"
 msgstr ""
 
-#: g10/keyedit.c:579
+#: g10/keyedit.c:582
 #, fuzzy
 msgid "add a secondary key"
 msgstr "добавить дополнительный ключ"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:583
 msgid "delkey"
 msgstr ""
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:583
 msgid "delete a secondary key"
 msgstr "удалить дополнительный ключ"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:584
 #, fuzzy
 msgid "delsig"
 msgstr "подписать"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:584
 #, fuzzy
 msgid "delete signatures"
 msgstr "список ключей и их подписей"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:585
 msgid "expire"
 msgstr ""
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:585
 #, fuzzy
 msgid "change the expire date"
 msgstr "изменить ключевую фразу"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:586
 msgid "toggle"
 msgstr ""
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:586
 msgid "toggle between secret and public key listing"
 msgstr "переключить между списком секретных и открытых ключей"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:588
 msgid "t"
 msgstr ""
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:589
 msgid "pref"
 msgstr ""
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:589
 msgid "list preferences"
 msgstr ""
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:590
 msgid "passwd"
 msgstr ""
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:590
 #, fuzzy
 msgid "change the passphrase"
 msgstr "изменить ключевую фразу"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 msgid "trust"
 msgstr ""
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 msgid "change the ownertrust"
 msgstr "изменить параметры доверия"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:592
 #, fuzzy
 msgid "revsig"
 msgstr "подписать"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:592
 #, fuzzy
 msgid "revoke signatures"
 msgstr "проверить подпись на ключе"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:593
 #, fuzzy
 msgid "revkey"
 msgstr "ключ"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:593
 #, fuzzy
 msgid "revoke a secondary key"
 msgstr "удалить дополнительный ключ"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:594
 msgid "disable"
 msgstr ""
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:594
 #, fuzzy
 msgid "disable a key"
 msgstr "Плохой ключ"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:595
 msgid "enable"
 msgstr ""
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:595
 #, fuzzy
 msgid "enable a key"
 msgstr "Плохой ключ"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:614
 msgid "can't do that in batchmode\n"
 msgstr "невозможно сделать это в пакетном режиме.\n"
 
 #. check that they match
-#. FIXME: check that they both match
-#: g10/keyedit.c:640
+#. fixme: check that they both match
+#: g10/keyedit.c:652
 #, fuzzy
 msgid "Secret key is available.\n"
 msgstr "Имеется секретный ключ.\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:681
 #, fuzzy
 msgid "Command> "
 msgstr "Команда> "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:711
 #, fuzzy
 msgid "Need the secret key to do this.\n"
 msgstr "Чтобы это сделать, нужен секретный ключ.\n"
 
-#: g10/keyedit.c:718
-msgid "Save changes? "
-msgstr "Сохранить изменения? "
-
-#: g10/keyedit.c:721
-msgid "Quit without saving? "
-msgstr "Выйти без сохранения? "
-
-#: g10/keyedit.c:731
-#, fuzzy, c-format
-msgid "update failed: %s\n"
-msgstr "обновление не удалось: %s\n"
-
-#: g10/keyedit.c:738
-#, fuzzy, c-format
-msgid "update secret failed: %s\n"
-msgstr "обновление секрета не удалось: %s\n"
-
-#: g10/keyedit.c:745
-msgid "Key not changed so no update needed.\n"
-msgstr "Ключ не изменился, обновление не нужно.\n"
-
-#: g10/keyedit.c:748 g10/keyedit.c:807
-#, fuzzy, c-format
-msgid "update of trustdb failed: %s\n"
-msgstr "обновление базы данных доверия не удалось: %s\n"
-
-#: g10/keyedit.c:781
+#: g10/keyedit.c:758
 msgid "Really sign all user ids? "
 msgstr "Действительно подписать все идентификаторы пользователя? "
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:759
 msgid "Hint: Select the user ids to sign\n"
 msgstr ""
 "Подсказка: выберите идентификаторы пользователя которые хотите подписать\n"
 
-#: g10/keyedit.c:818 g10/keyedit.c:839
+#: g10/keyedit.c:786 g10/keyedit.c:968
+#, fuzzy, c-format
+msgid "update of trustdb failed: %s\n"
+msgstr "обновление базы данных доверия не удалось: %s\n"
+
+#: g10/keyedit.c:797 g10/keyedit.c:818
 msgid "You must select at least one user id.\n"
 msgstr "Вы должны выбрать хотя бы один идентификатор пользователя.\n"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:799
 msgid "You can't delete the last user id!\n"
 msgstr "Вы не можете удалить последний идентификатор пользователя!\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:802
 #, fuzzy
 msgid "Really remove all selected user ids? "
 msgstr "Действительно удалить все выбранные идентификаторы пользователя? "
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:803
 #, fuzzy
 msgid "Really remove this user id? "
 msgstr "Действительно удалить этот идентификатор пользователя? "
 
-#: g10/keyedit.c:860 g10/keyedit.c:882
+#: g10/keyedit.c:839 g10/keyedit.c:861
 msgid "You must select at least one key.\n"
 msgstr "Вы должны выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:864
+#: g10/keyedit.c:843
 #, fuzzy
 msgid "Do you really want to delete the selected keys? "
 msgstr "Вы действительно хотите удалить выбранные ключи? "
 
-#: g10/keyedit.c:865
+#: g10/keyedit.c:844
 #, fuzzy
 msgid "Do you really want to delete this key? "
 msgstr "Вы действительно хотите удалить этот ключ? "
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:865
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Вы действительно хотите удалить выбранные ключи? "
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:866
 #, fuzzy
 msgid "Do you really want to revoke this key? "
 msgstr "Вы действительно хотите удалить этот ключ? "
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:932
+msgid "Save changes? "
+msgstr "Сохранить изменения? "
+
+#: g10/keyedit.c:935
+msgid "Quit without saving? "
+msgstr "Выйти без сохранения? "
+
+#: g10/keyedit.c:946
+#, fuzzy, c-format
+msgid "update failed: %s\n"
+msgstr "обновление не удалось: %s\n"
+
+#: g10/keyedit.c:953
+#, fuzzy, c-format
+msgid "update secret failed: %s\n"
+msgstr "обновление секрета не удалось: %s\n"
+
+#: g10/keyedit.c:960
+msgid "Key not changed so no update needed.\n"
+msgstr "Ключ не изменился, обновление не нужно.\n"
+
+#: g10/keyedit.c:975
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Недопустимая команда (попробуйте \"help\")\n"
 
-#: g10/keyedit.c:1039
+#: g10/keyedit.c:1065
 #, fuzzy
 msgid "This key has been disabled"
 msgstr "Замечание: Срок действия ключа уже истек!\n"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1336
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1340
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1344
 #, fuzzy
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "сгенерировать отзывающий сертификат"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1350
 #, fuzzy
 msgid "Really delete this self-signature? (y/N)"
 msgstr "сгенерировать отзывающий сертификат"
 
-#: g10/keyedit.c:1338
+#: g10/keyedit.c:1364
 #, fuzzy, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d плохих подписей\n"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1365
 #, fuzzy, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d плохих подписей\n"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1368
 #, fuzzy
 msgid "Nothing deleted.\n"
 msgstr "ВНИМАНИЕ: Используется ключ к которому нет доверия!\n"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1437
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1443
 #, fuzzy
 msgid "Please select at most one secondary key.\n"
 msgstr "Вы должны выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1447
 msgid "Changing expiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1449
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1464
+#: g10/keyedit.c:1490
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1506
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:1540
+#: g10/keyedit.c:1566
 #, c-format
 msgid "No user id with index %d\n"
 msgstr "Нет идентификатора пользователя с индексом %d\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1612
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Нет дополнительного ключа с индексом %d\n"
 
-#: g10/keyedit.c:1684
+#: g10/keyedit.c:1710
 #, fuzzy
 msgid "user ID: \""
 msgstr "Введите идентификатор пользователя: "
 
-#: g10/keyedit.c:1687
+#: g10/keyedit.c:1713
 #, fuzzy, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr "Нечего подписывать ключам %08lX\n"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1717
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "сгенерировать отзывающий сертификат"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1797
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "сгенерировать отзывающий сертификат"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1820
 #, fuzzy
 msgid "no secret key\n"
 msgstr "Плохой секретный ключ"
@@ -3368,6 +3398,9 @@ msgstr "Помощь отсутствует."
 msgid "No help available for `%s'"
 msgstr "Помощь для `%s' отсутствует."
 
+#~ msgid "print all message digests"
+#~ msgstr "напечатать все дайджесты сообщения"
+
 #, fuzzy
 #~ msgid "lid %lu: user id not found in keyblock\n"
 #~ msgstr "%s: пользователь не найден\n"
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 6f73e8cca..e611a0228 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 14 19:42:08 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
+
+
+	* ltmain.sh, ltconfig.sh : Updated to libtool 1.3.3
+
 Mon Jul 12 14:55:34 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
 
diff --git a/tools/lspgpot b/tools/lspgpot
index 4041367f5..585629b5b 100755
--- a/tools/lspgpot
+++ b/tools/lspgpot
@@ -1,6 +1,6 @@
 #!/bin/sh
 # lspgpot - script to extract the ownertrust values
-# from a PGP keyrings and list them in GnuPG ownertrust format.
+# from PGP keyrings and list them in GnuPG ownertrust format.
 
 ../g10/gpg --dry-run --with-fingerprint --with-colons $* | awk '
 BEGIN { FS=":"
diff --git a/util/strgutil.c b/util/strgutil.c
index b27f9b7b6..87eaad423 100644
--- a/util/strgutil.c
+++ b/util/strgutil.c
@@ -1,4 +1,4 @@
-/* strgutil.c -  miscellaneous utilities
+/* strgutil.c -  string utilities
  *	Copyright (C) 1998 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.