See ChangeLog: Mon Mar 8 20:47:17 CET 1999 Werner Koch

39 files changed, 2456 insertions, 2353 deletions

diff --git a/BUGS b/BUGS
index 856516967..6e8756833 100644
--- a/BUGS
+++ b/BUGS
@@ -18,12 +18,6 @@ and after about half a day in the rsync snapshots.
     and pgp263in has problems if the clearsign has been created by
     pgp263ia.
 
-[***] #2  1999-02-21
-    Problem while importing or deleting public keys in 0.9.3 - 0.9.2
-    worked fine.  Error message:
-    gpg:[stdin]: key A6A59DB9: secret key not found: public key not found
-    FIX: 1999-02-22 wk
-
 [  *] #3
     --list-packets should continue even w/o a passphrase (or in batch
     mode).  Maybe we have to move it to a separate program??
@@ -50,35 +44,6 @@ and after about half a day in the rsync snapshots.
     Buserror on IRIX 6.4: Crash while doing a keygen. I think while creating
     the prime.	Other buserrors are reported when doing a "gpg README"
     on sparc-solaris2.6.
-    --> I hope I've fixed this: Please, can check someone it.
+    --> I hope I've fixed this: Please, can someone check this.
 	I can't reproduce it on the alpha I have access to.
 
-[  *] #7 1999-02-22 <[email protected]> 0.9.3
-    Conventional encrytion incompatibilty:
-     $ gpg -c --cipher-algo cast5 --compress-algo 1 --no-comment secrets.txt
-    Creates a file that gpg can decrypt, but PGP 5.5 has problems with it.
-    PGP decrypts 6416k out of 6424k, then complains with "PGP Warning",
-    "The keyring contains a bad (corrupted) PGP packet".  The resulting
-    file is missing information from the front.
-    [26.02.99: temporary fix in encrypt_simple()]
-
-[  *] #8 1999-02-25 <[email protected]> 0.9.3
-    %gpg --encrypt -r [email protected] --batch foo
-    gpg: Warning: using insecure memory!
-    gpg: 11C23F61: no info to calculate a trust probability
-    This creates a symmetrically encrypted message WITHOUT a session key
-    encrypted with public cryptographic(i.e. foo.gpg). This is probably
-    FIX: 199-02-26 wk
-
-[ **] #9 1999-02-25
-    Misalignment in md5.c#md5_write.
-    FIX: 1999-02-26 wk
-
-[ **] #10 1999-03-01
-    Armor detection code is broken.  Direct import of keyrings is not possible.
-    FIX: 1999-03-02 wk
-
-[***] #11 1999-02-25
-    "cipher algo 10 not found".
-    FIX: 1999-02-25 wk
-
diff --git a/ChangeLog b/ChangeLog
index 5b58729ff..c71ee2ac1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Mar  8 20:47:17 CET 1999  Werner Koch  <[email protected]>
+
+	* configure.in (DLSYM_NEEDS_UNDERSCORE): Replaced.
+	* acinclude.in (AM_SYS_SYMBOL_UNDERSCORE): New.
+
+	* VERSION: Now 0.9.4
+
 Sun Feb 28 19:11:00 CET 1999  Werner Koch  <[email protected]>
 
 	* configure.in (dld): Test disabled.
diff --git a/NEWS b/NEWS
index b3c2f5429..07f84df20 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,13 @@
+Noteworthy changes in version 0.9.4
+-----------------------------------
 
     * New configure option --enable-static-rnd=[egd|linux|unix|none]
       to select a random gathering module for static linking.
 
     * The original text is now verbatim copied to a cleartext signed message.
 
+    * Bugfixes but there are still a couple of bugs.
+
 
 Noteworthy changes in version 0.9.3
 -----------------------------------
diff --git a/OBUGS b/OBUGS
index 109b1b73d..95c892a09 100644
--- a/OBUGS
+++ b/OBUGS
@@ -4,4 +4,40 @@
 (format: severity: [  *] to [***], no, first reported, by, version)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+[***] #2  1999-02-21
+    Problem while importing or deleting public keys in 0.9.3 - 0.9.2
+    worked fine.  Error message:
+    gpg:[stdin]: key A6A59DB9: secret key not found: public key not found
+    FIX: 1999-02-22 wk
+
+[  *] #7 1999-02-22 <[email protected]> 0.9.3
+    Conventional encrytion incompatibilty:
+     $ gpg -c --cipher-algo cast5 --compress-algo 1 --no-comment secrets.txt
+    Creates a file that gpg can decrypt, but PGP 5.5 has problems with it.
+    PGP decrypts 6416k out of 6424k, then complains with "PGP Warning",
+    "The keyring contains a bad (corrupted) PGP packet".  The resulting
+    file is missing information from the front.
+    FIX: 1999-02-26 temporary fix in encrypt_simple()
+
+
+[  *] #8 1999-02-25 <[email protected]> 0.9.3
+    %gpg --encrypt -r [email protected] --batch foo
+    gpg: Warning: using insecure memory!
+    gpg: 11C23F61: no info to calculate a trust probability
+    This creates a symmetrically encrypted message WITHOUT a session key
+    encrypted with public cryptographic(i.e. foo.gpg). This is probably
+    FIX: 199-02-26 wk
+
+[ **] #9 1999-02-25
+    Misalignment in md5.c#md5_write.
+    FIX: 1999-02-26 wk
+
+[ **] #10 1999-03-01
+    Armor detection code is broken.  Direct import of keyrings is not possible.
+    FIX: 1999-03-02 wk
+
+[***] #11 1999-02-25
+    "cipher algo 10 not found".
+    FIX: 1999-02-25 wk
+
 
diff --git a/README b/README
index 845c15beb..04d4782f3 100644
--- a/README
+++ b/README
@@ -1,3 +1,6 @@
+Please note that this is only a bug fix release and some things
+do not yet work - see TODO for parts which are problematic
+
 -----BEGIN PGP SIGNED MESSAGE-----
 
                     GnuPG - The GNU Privacy Guard
diff --git a/TODO b/TODO
index c57d79c5f..af8e8ced8 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,6 @@
 
+  * Finish the EGD module.
+
   * Implement 256 bit key Twofish.
 
   * Check revocation and expire stuff.	[I'm currently working on this.]
@@ -20,6 +22,7 @@
 
 Nice to have
 ------------
+  * Do a real fix for bug #7 or document that it is a PGP 5 error.
   * clearsig: Keep lineendings while writing the output of a clearsig
   * preferences of hash algorithms are not yet used.
   * new menu to delete signatures and list signature in menu
diff --git a/VERSION b/VERSION
index d28202e4b..a602fc9e2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.9.3a
+0.9.4
diff --git a/acconfig.h b/acconfig.h
index fe2ac2fc8..e3b4f29e7 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -74,7 +74,6 @@
 #undef USE_DYNAMIC_LINKING
 #undef HAVE_DL_DLOPEN
 #undef HAVE_DLD_DLD_LINK
-#undef DLSYM_NEEDS_UNDERSCORE
 
 #undef USE_SHM_COPROCESSING
 
diff --git a/acinclude.m4 b/acinclude.m4
index 2349da629..2d0b69b60 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -342,5 +342,222 @@ define(GNUPG_CHECK_MLOCK,
     fi
   ])
 
+#####################################################################
+# AM_SYS_SYMBOL_UNDERSCORE, AM_SYS_NM_PARSE:
+# This has been taken from glib 1.2.0 acinclude.m4 which states that
+# it is copyrighted by the FSF
+################################################################### ##
+dnl AM_SYS_SYMBOL_UNDERSCORE - does the compiler prefix global symbols
+dnl                            with an underscore?
+AC_DEFUN(AM_SYS_SYMBOL_UNDERSCORE,
+[AC_REQUIRE([AM_PROG_NM])dnl
+AC_REQUIRE([AM_SYS_NM_PARSE])dnl
+AC_MSG_CHECKING([for _ prefix in compiled symbols])
+AC_CACHE_VAL(ac_cv_sys_symbol_underscore,
+[ac_cv_sys_symbol_underscore=no
+cat > conftest.$ac_ext <<EOF
+void nm_test_func(){}
+int main(){nm_test_func;return 0;}
+EOF
+if AC_TRY_EVAL(ac_compile); then
+  # Now try to grab the symbols.
+  ac_nlist=conftest.nm
+  if AC_TRY_EVAL(NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
+    # See whether the symbols have a leading underscore.
+    if egrep '^_nm_test_func' "$ac_nlist" >/dev/null; then
+      ac_cv_sys_symbol_underscore=yes
+    else
+      if egrep '^nm_test_func ' "$ac_nlist" >/dev/null; then
+        :
+      else
+        echo "configure: cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
+      fi
+    fi
+  else
+    echo "configure: cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC
+  fi
+else
+  echo "configure: failed program was:" >&AC_FD_CC
+  cat conftest.c >&AC_FD_CC
+fi
+rm -rf conftest*
+])
+AC_MSG_RESULT($ac_cv_sys_symbol_underscore)
+if test x$ac_cv_sys_symbol_underscore = xyes; then
+  AC_DEFINE(WITH_SYMBOL_UNDERSCORE,1,
+  [define if compiled symbols have a leading underscore])
+fi
+])
+
+
+dnl AM_SYS_NM_PARSE - Check for command to grab the raw symbol name followed
+dnl                   by C symbol name from nm.
+AC_DEFUN(AM_SYS_NM_PARSE,
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AM_PROG_NM])dnl
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output])
+AC_CACHE_VAL(ac_cv_sys_global_symbol_pipe,
+[# These are sane defaults that work on at least a few old systems.
+# {They come from Ultrix.  What could be older than Ultrix?!! ;)}
+
+changequote(,)dnl
+# Character class describing NM global symbol codes.
+ac_symcode='[BCDEGRSTU]'
+
+# Regexp to match symbols that can be accessed directly from C.
+ac_sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Transform the above into a raw symbol and a C symbol.
+ac_symxfrm='\1 \1'
+
+# Define system-specific variables.
+case "$host_os" in
+aix*)
+  ac_symcode='[BCDTU]'
+  ;;
+sunos* | cygwin32* | mingw32*)
+  ac_sympat='_\([_A-Za-z][_A-Za-z0-9]*\)'
+  ac_symxfrm='_\1 \1'
+  ;;
+irix*)
+  # Cannot use undefined symbols on IRIX because inlined functions mess us up.
+  ac_symcode='[BCDEGRST]'
+  ;;
+solaris*)
+  ac_symcode='[BDTU]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
+  ac_symcode='[ABCDGISTUW]'
+fi
+
+case "$host_os" in
+cygwin32* | mingw32*)
+  # We do not want undefined symbols on cygwin32.  The user must
+  # arrange to define them via -l arguments.
+  ac_symcode='[ABCDGISTW]'
+  ;;
+esac
+changequote([,])dnl
+
+# Write the raw and C identifiers.
+ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.* $ac_symcode $ac_sympat$/$ac_symxfrm/p'"
+
+# Check to see that the pipe works correctly.
+ac_pipe_works=no
+cat > conftest.$ac_ext <<EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func;return 0;}
+EOF
+if AC_TRY_EVAL(ac_compile); then
+  # Now try to grab the symbols.
+  ac_nlist=conftest.nm
+  if AC_TRY_EVAL(NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
+
+    # Try sorting and uniquifying the output.
+    if sort "$ac_nlist" | uniq > "$ac_nlist"T; then
+      mv -f "$ac_nlist"T "$ac_nlist"
+      ac_wcout=`wc "$ac_nlist" 2>/dev/null`
+changequote(,)dnl
+      ac_count=`echo "X$ac_wcout" | sed -e 's,^X,,' -e 's/^[    ]*\([0-9][0-9]*\).*$/\1/'`
+changequote([,])dnl
+      (test "$ac_count" -ge 0) 2>/dev/null || ac_count=-1
+    else
+      rm -f "$ac_nlist"T
+      ac_count=-1
+    fi
+
+    # Make sure that we snagged all the symbols we need.
+    if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then
+      if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then
+        cat <<EOF > conftest.c
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+EOF
+        # Now generate the symbol file.
+        sed 's/^.* \(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
+
+        cat <<EOF >> conftest.c
+#if defined (__STDC__) && __STDC__
+# define __ptr_t void *
+#else
+# define __ptr_t char *
+#endif
+
+/* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */
+int dld_preloaded_symbol_count = $ac_count;
+
+/* The mapping between symbol names and symbols. */
+struct {
+  char *name;
+  __ptr_t address;
+}
+changequote(,)dnl
+dld_preloaded_symbols[] =
+changequote([,])dnl
+{
+EOF
+        sed 's/^\(.*\) \(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
+        cat <<\EOF >> conftest.c
+  {0, (__ptr_t) 0}
+};
+
+#ifdef __cplusplus
+}
+#endif
+EOF
+        # Now try linking the two files.
+        mv conftest.$ac_objext conftestm.$ac_objext
+        ac_save_LIBS="$LIBS"
+        ac_save_CFLAGS="$CFLAGS"
+        LIBS="conftestm.$ac_objext"
+        CFLAGS="$CFLAGS$no_builtin_flag"
+        if AC_TRY_EVAL(ac_link) && test -s conftest; then
+          ac_pipe_works=yes
+        else
+          echo "configure: failed program was:" >&AC_FD_CC
+          cat conftest.c >&AC_FD_CC
+        fi
+        LIBS="$ac_save_LIBS"
+        CFLAGS="$ac_save_CFLAGS"
+      else
+        echo "cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
+      fi
+    else
+      echo "cannot find nm_test_var in $ac_nlist" >&AC_FD_CC
+    fi
+  else
+    echo "cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC
+  fi
+else
+  echo "$progname: failed program was:" >&AC_FD_CC
+  cat conftest.c >&AC_FD_CC
+fi
+rm -rf conftest*
+
+# Do not use the global_symbol_pipe unless it works.
+test "$ac_pipe_works" = yes || ac_cv_sys_global_symbol_pipe=
+])
+
+ac_result=yes
+if test -z "$ac_cv_sys_global_symbol_pipe"; then
+   ac_result=no
+fi
+AC_MSG_RESULT($ac_result)
+])
+dnl end of AM_SYS_NM_PARSE
+
 
 dnl *-*wedit:notab*-*  Please keep this as the last line.
diff --git a/checks/ChangeLog b/checks/ChangeLog
index b2869731a..27397c0e4 100644
--- a/checks/ChangeLog
+++ b/checks/ChangeLog
@@ -1,3 +1,7 @@
+Mon Mar  8 20:47:17 CET 1999  Werner Koch  <[email protected]>
+
+	* pubdemo.asc, secdemo.asc: New.
+
 Fri Feb 19 15:49:15 CET 1999  Werner Koch  <[email protected]>
 
 	* genkey1024.test: Be really quiet.
diff --git a/checks/Makefile.am b/checks/Makefile.am
index 38b163fcf..ab0e2ec09 100644
--- a/checks/Makefile.am
+++ b/checks/Makefile.am
@@ -14,7 +14,7 @@ TESTS = version.test mds.test \
 
 TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \
 	     plain-1.asc plain-2.asc plain-3.asc plain-1-pgp.asc \
-	     pubring.pkr.asc secring.skr.asc
+	     pubring.pkr.asc secring.skr.asc secdemo.asc pubdemo.asc
 
 DATA_FILES = data-500 data-9000 data-32000 data-80000 plain-large
 
diff --git a/checks/defs.inc b/checks/defs.inc
index 840fc69d2..7255fbad1 100755
--- a/checks/defs.inc
+++ b/checks/defs.inc
@@ -78,7 +78,6 @@ cat <<EOF  >./options
 no-greeting
 no-secmem-warning
 load-extension ../cipher/tiger
-load-extension ../cipher/rndlinux
 batch
 EOF
 
diff --git a/checks/secdemo.asc b/checks/secdemo.asc
index 08fb94925..343453c45 100644
--- a/checks/secdemo.asc
+++ b/checks/secdemo.asc
@@ -1,4 +1,4 @@
-26 demo keys:
+26 demo keys (passphrase is "abc"):
 
 sec  1024D/68697734 1999-03-08 Alpha Test (demo key) <[email protected]>
 uid                            Alice (demo key)
diff --git a/cipher/ChangeLog b/cipher/ChangeLog
index bc9aa54e5..a9a720f26 100644
--- a/cipher/ChangeLog
+++ b/cipher/ChangeLog
@@ -1,3 +1,7 @@
+Mon Mar  8 20:47:17 CET 1999  Werner Koch  <[email protected]>
+
+	* dynload.c (DLSYM_NEEDS_UNDERSCORE): Renamed.
+
 Fri Feb 26 17:55:41 CET 1999  Werner Koch  <[email protected]>
 
 	* md.c: Nearly a total rewrote.
diff --git a/cipher/dynload.c b/cipher/dynload.c
index 75dcb3969..b4ed77177 100644
--- a/cipher/dynload.c
+++ b/cipher/dynload.c
@@ -32,7 +32,7 @@
 #include "cipher.h"
 #include "dynload.h"
 
-#ifdef DLSYM_NEEDS_UNDERSCORE
+#ifdef WITH_SYMBOL_UNDERSCORE
   #define SYMBOL_VERSION "_gnupgext_version"
   #define SYMBOL_ENUM	 "_gnupgext_enum_func"
 #else
diff --git a/configure.in b/configure.in
index 84fcbdb3b..dbc1c59db 100644
--- a/configure.in
+++ b/configure.in
@@ -171,7 +171,7 @@ case "${target}" in
 esac
 
 AC_SUBST(MPI_OPT_FLAGS)
-
+AM_SYS_SYMBOL_UNDERSCORE
 GNUPG_CHECK_PIC
 GNUPG_CHECK_RDYNAMIC
 if test "$NO_PIC" = yes; then
@@ -241,9 +241,6 @@ if test "$try_dynload" = yes ; then
       AC_DEFINE(USE_DYNAMIC_LINKING)
       AC_DEFINE(HAVE_DL_DLOPEN)
       DYNLINK_LDFLAGS="$CFLAGS_RDYNAMIC"
-      dnl fixme: this is probably false but it should
-      dnl work for freebsd
-      AC_DEFINE(DLSYM_NEEDS_UNDERSCORE)
       use_gnupg_extensions=yes
 dnl else
 dnl
@@ -429,12 +426,10 @@ echo '}' >>cipher/construct.c
 dnl
 dnl Figure how to link the cipher modules
 dnl
-dnl (form now these are only dynamic)
 AC_SUBST(STATIC_CIPHER_OBJS)
 AC_SUBST(DYNAMIC_CIPHER_MODS)
 
 
-
 dnl setup assembler stuff
 AC_MSG_CHECKING(for mpi assembler functions)
 if test -f $srcdir/mpi/config.links ; then
diff --git a/debian/changelog b/debian/changelog
index dd58db671..6d71f15cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnupg (0.9.4) unstable; urgency=low
+
+  * New version.
+  * debian/control: s/GNUPG/GnuPG/
+
+ -- Werner Koch <[email protected]>  Mon, 8 Mar 1999 19:58:28 +0100
+
 gnupg (0.9.2-1) unstable; urgency=low
 
   * New version.
diff --git a/debian/control b/debian/control
index 1c5f906e9..dfb4546c1 100644
--- a/debian/control
+++ b/debian/control
@@ -8,16 +8,16 @@ Package: gnupg
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: GNU privacy guard - a free PGP replacement.
- GNUPG is the GNU encryption and signing tool.  As you can see from the 
- version number, the program may have some bugs and some features may not 
+ GnuPG is the GNU encryption and signing tool.	As you can see from the
+ version number, the program may have some bugs and some features may not
  work at all.
  .
- Due to the fact that GNUPG does not use use any patented algorithm,
+ Due to the fact that GnuPG does not use use any patented algorithm,
  it cannot be compatible to old PGP versions, because those use
  IDEA (which is worldwide patented) and RSA (which is patented in
- the United States until Sep 20, 2000).  
+ the United States until Sep 20, 2000).
  .
- GNUPG is in almost all aspects compatible with other OpenPGP
- implementations. The default algorithms are DSA and ELGamal.  
+ GnuPG is in almost all aspects compatible with other OpenPGP
+ implementations. The default algorithms are DSA and ELGamal.
  Symmetric algorithms are: Blowfish and CAST5, Digest algorithms are
  MD5, RIPEMD160, SHA1 and TIGER/192.
diff --git a/debian/rules b/debian/rules
index f0d81e18f..96b966018 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# debian/rules file - for GNUPG (0.9.2)
+# debian/rules file - for GNUPG (0.9.4)
 # Based on sample debian/rules file - for GNU Hello (1.3).
 # Copyright 1994,1995 by Ian Jackson.
 # Copyright 1998 James Troup
diff --git a/doc/DETAILS b/doc/DETAILS
index 9c45b58e1..e204b44b0 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -64,12 +64,12 @@ more arguments in future versions.
 	as GOODSIG but has the fingerprint as the argument. Both
 	status lines ere emitted for a good signature.
 
-    SIG_ID  <radix64_string>
+    SIG_ID  <radix64_string>  <sig_creation_date>
 	This is emitted only for signatures which
 	have been verified okay.  The string is a signature id
 	and may be used in applications to detect replay attacks
 	of signed messages.  Note that only DLP algorithms give
-	unique ids - others may yoild duplicated ones when they
+	unique ids - others may yield duplicated ones when they
 	have been created in the same second.
 
     TRUST_UNDEFINED
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 034041849..9e3e460bd 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,17 @@
+Mon Mar  8 20:47:17 CET 1999  Werner Koch  <[email protected]>
+
+	* getkey.c (classify_user_id): Add new mode 12 (#<lid>).
+
+	* seckey-cert.c (check_secret_key): replaced error by info.
+
+	* trustdb.c (query_trust_info): Add another arg, changed all callers.
+	(check_trust): Ditto.
+	(do_check): Ditto.
+	(verify_key): Handle namehash.
+	* keylist.c (list_keyblock): print trust info for user ids.
+
+	* sig-check.c (signature_check): Add sig-created to status output.
+
 Tue Mar  2 16:44:57 CET 1999  Werner Koch  <[email protected]>
 
 	* textfilter.c (copy_clearsig_text): New.
diff --git a/g10/getkey.c b/g10/getkey.c
index 01ffe0111..424590ed2 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -506,6 +506,7 @@ hextobyte( const byte *s )
  *  6 = word match mode
  * 10 = it is a short KEYID (don't care about keyid[0])
  * 11 = it is a long  KEYID
+ * 12 = it is a trustdb index (keyid is looked up)
  * 16 = it is a 16 byte fingerprint
  * 20 = it is a 20 byte fingerprint
  *
@@ -624,7 +625,12 @@ classify_user_id( const char *name, u32 *keyid, byte *fprint,
 	s++;
     }
     else if( *s == '#' ) { /* use local id */
-	return 0;
+	mode = 12;
+	s++;
+	if( keyid ) {
+	    if( keyid_from_lid( strtoul( s, NULL, 10), keyid ) )
+		keyid[0] = keyid[1] = 0;
+	}
     }
     else if( !*s )  /* empty string */
 	return 0;
@@ -1561,54 +1567,6 @@ finish_lookup_sk( KBNODE keyblock, PKT_secret_key *sk, KBNODE k, int primary )
 }
 
 
-/****** old code from lookup_read ******/
-#if 0 /* can't use it anymore - invent a more general approach */
-    /* try the quick functions */
-    if( !ctx->count ) {
-	k = NULL;
-	switch( ctx->mode ) {
-	  case 10:
-	  case 11:
-	    rc = locate_keyblock_by_keyid( &ctx->kbpos, ctx->keyid,
-							ctx->mode==10, 0 );
-	    if( !rc )
-		rc = read_keyblock( &ctx->kbpos, &ctx->keyblock );
-	    if( !rc )
-		k = find_by_keyid( ctx->keyblock, pk, ctx->keyid, ctx->mode );
-	    break;
-
-	  case 16:
-	  case 20:
-	    rc = locate_keyblock_by_fpr( &ctx->kbpos, ctx->name, ctx->mode, 0 );
-	    if( !rc )
-		rc = read_keyblock( &ctx->kbpos, &ctx->keyblock );
-	    if( !rc )
-		k = find_by_fpr( ctx->keyblock, pk, ctx->name, ctx->mode );
-	    break;
-
-	  default: rc = G10ERR_UNSUPPORTED;
-	}
-	if( !rc ) {
-	    if( !k ) {
-		log_error("lookup: key has been located but was not found\n");
-		rc = G10ERR_INV_KEYRING;
-	    }
-	    else
-		finish_lookup( ctx->keyblock, pk, k, namehash, 0, ctx->primary );
-	}
-    }
-    else
-	rc = G10ERR_UNSUPPORTED;
-
-    /* if this was not possible, loop over all keyblocks
-     * fixme: If one of the resources in the quick functions above
-     *	      works, but the key was not found, we will not find it
-     *	      in the other resources */
-    if( rc == G10ERR_UNSUPPORTED ) {
-    }
-#endif
-
-
 static int
 lookup_pk( GETKEY_CTX ctx, PKT_public_key *pk, KBNODE *ret_keyblock )
 {
@@ -1636,7 +1594,7 @@ lookup_pk( GETKEY_CTX ctx, PKT_public_key *pk, KBNODE *ret_keyblock )
 		    k = find_by_name( ctx->keyblock, pk,
 				      item->name, item->mode,
 				      namehash, &use_namehash );
-		else if( item->mode == 10 || item->mode == 11 )
+		else if( item->mode >= 10 && item->mode <= 12 )
 		    k = find_by_keyid( ctx->keyblock, pk,
 				       item->keyid, item->mode );
 		else if( item->mode == 15 )
@@ -1723,7 +1681,7 @@ lookup_sk( GETKEY_CTX ctx, PKT_secret_key *sk, KBNODE *ret_keyblock )
 		if( item->mode < 10 )
 		    k = find_by_name_sk( ctx->keyblock, sk,
 					 item->name, item->mode );
-		else if( item->mode == 10 || item->mode == 11 )
+		else if( item->mode >= 10 && item->mode <= 12 )
 		    k = find_by_keyid_sk( ctx->keyblock, sk,
 					  item->keyid, item->mode );
 		else if( item->mode == 15 )
@@ -1765,143 +1723,6 @@ lookup_sk( GETKEY_CTX ctx, PKT_secret_key *sk, KBNODE *ret_keyblock )
 }
 
 
-#if 0
-OLD/************
-OLD * Ditto for secret keys WORK!!!!!!
-OLD */
-OLDstatic int
-OLDlookup_sk( PKT_secret_key *sk, int mode,  u32 *keyid, const char *name,
-OLD	      int primary )
-OLD{
-OLD    int rc;
-OLD    KBNODE keyblock = NULL;
-OLD    KBPOS kbpos;
-OLD    int oldmode = set_packet_list_mode(0);
-OLD
-OLD    rc = enum_keyblocks( 5 /* open secret */, &kbpos, &keyblock );
-OLD    if( rc ) {
-OLD	   if( rc == -1 )
-OLD	       rc = G10ERR_NO_SECKEY;
-OLD	   else if( rc )
-OLD	       log_error("enum_keyblocks(open secret) failed: %s\n", g10_errstr(rc) );
-OLD	   goto leave;
-OLD    }
-OLD
-OLD    while( !(rc = enum_keyblocks( 1, &kbpos, &keyblock )) ) {
-OLD	   KBNODE k, kk;
-OLD	   if( mode < 10 ) { /* name lookup */
-OLD	       for(k=keyblock; k; k = k->next ) {
-OLD		   if( k->pkt->pkttype == PKT_USER_ID
-OLD		       && !compare_name( k->pkt->pkt.user_id->name,
-OLD					 k->pkt->pkt.user_id->len, name, mode)) {
-OLD		       /* we found a matching name, look for the key */
-OLD		       for(kk=keyblock; kk; kk = kk->next ) {
-OLD			   if( (    kk->pkt->pkttype == PKT_SECRET_KEY
-OLD				 || kk->pkt->pkttype == PKT_SECRET_SUBKEY )
-OLD			       && ( !sk->pubkey_algo
-OLD				    || sk->pubkey_algo
-OLD				       == kk->pkt->pkt.secret_key->pubkey_algo)
-OLD			       && ( !sk->pubkey_usage
-OLD				    || !check_pubkey_algo2(
-OLD					  kk->pkt->pkt.secret_key->pubkey_algo,
-OLD							      sk->pubkey_usage ))
-OLD			     )
-OLD			       break;
-OLD		       }
-OLD		       if( kk ) {
-OLD			   u32 aki[2];
-OLD			   keyid_from_sk( kk->pkt->pkt.secret_key, aki );
-OLD			   cache_user_id( k->pkt->pkt.user_id, aki );
-OLD			   k = kk;
-OLD			   break;
-OLD		       }
-OLD		       else
-OLD			   log_error("No key for userid (in sk)\n");
-OLD		   }
-OLD	       }
-OLD	   }
-OLD	   else { /* keyid or fingerprint lookup */
-OLD	       if( DBG_CACHE && (mode== 10 || mode==11) ) {
-OLD		   log_debug("lookup_sk keyid=%08lx%08lx req_algo=%d mode=%d\n",
-OLD				   (ulong)keyid[0], (ulong)keyid[1],
-OLD				    sk->pubkey_algo, mode );
-OLD	       }
-OLD	       for(k=keyblock; k; k = k->next ) {
-OLD		   if(	  k->pkt->pkttype == PKT_SECRET_KEY
-OLD		       || k->pkt->pkttype == PKT_SECRET_SUBKEY ) {
-OLD		       if( mode == 10 || mode == 11 ) {
-OLD			   u32 aki[2];
-OLD			   keyid_from_sk( k->pkt->pkt.secret_key, aki );
-OLD			   if( DBG_CACHE ) {
-OLD			       log_debug("             aki=%08lx%08lx algo=%d\n",
-OLD					       (ulong)aki[0], (ulong)aki[1],
-OLD				       k->pkt->pkt.secret_key->pubkey_algo    );
-OLD			   }
-OLD			   if( aki[1] == keyid[1]
-OLD			       && ( mode == 10 || aki[0] == keyid[0] )
-OLD			       && ( !sk->pubkey_algo
-OLD				    || sk->pubkey_algo
-OLD				       == k->pkt->pkt.secret_key->pubkey_algo) ){
-OLD			       /* cache the userid */
-OLD			       for(kk=keyblock; kk; kk = kk->next )
-OLD				   if( kk->pkt->pkttype == PKT_USER_ID )
-OLD				       break;
-OLD			       if( kk )
-OLD				   cache_user_id( kk->pkt->pkt.user_id, aki );
-OLD			       else
-OLD				   log_error("No userid for key\n");
-OLD			       break; /* found */
-OLD			   }
-OLD		       }
-OLD		       else if( mode == 15 ) { /* get the first key */
-OLD			   if( !sk->pubkey_algo
-OLD			       || sk->pubkey_algo
-OLD				     == k->pkt->pkt.secret_key->pubkey_algo )
-OLD			       break;
-OLD		       }
-OLD		       else if( mode == 16 || mode == 20 ) {
-OLD			   size_t an;
-OLD			   byte afp[MAX_FINGERPRINT_LEN];
-OLD
-OLD			   fingerprint_from_sk(k->pkt->pkt.secret_key, afp, &an );
-OLD			   if( an == mode && !memcmp( afp, name, an)
-OLD			       && ( !sk->pubkey_algo
-OLD				    || sk->pubkey_algo
-OLD				       == k->pkt->pkt.secret_key->pubkey_algo) ) {
-OLD			       break;
-OLD			   }
-OLD		       }
-OLD		       else
-OLD			   BUG();
-OLD		   } /* end compare secret keys */
-OLD	       }
-OLD	   }
-OLD	   if( k ) { /* found */
-OLD	       assert(	  k->pkt->pkttype == PKT_SECRET_KEY
-OLD		       || k->pkt->pkttype == PKT_SECRET_SUBKEY );
-OLD	       assert( keyblock->pkt->pkttype == PKT_SECRET_KEY );
-OLD	       if( primary && !sk->pubkey_usage )
-OLD		   copy_secret_key( sk, keyblock->pkt->pkt.secret_key );
-OLD	       else
-OLD		   copy_secret_key( sk, k->pkt->pkt.secret_key );
-OLD	       break; /* enumeration */
-OLD	   }
-OLD	   release_kbnode( keyblock );
-OLD	   keyblock = NULL;
-OLD    }
-OLD    if( rc == -1 )
-OLD	   rc = G10ERR_NO_SECKEY;
-OLD    else if( rc )
-OLD	   log_error("enum_keyblocks(read) failed: %s\n", g10_errstr(rc));
-OLD
-OLD  leave:
-OLD    enum_keyblocks( 2, &kbpos, &keyblock ); /* close */
-OLD    release_kbnode( keyblock );
-OLD    set_packet_list_mode(oldmode);
-OLD    return rc;
-OLD}
-#endif
-
 
 /****************
  * fixme: replace by the generic function
diff --git a/g10/keyedit.c b/g10/keyedit.c
index f16a19cb6..f818b35df 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -889,7 +889,7 @@ show_key_with_all_names( KBNODE keyblock, int only_marked,
 	    if( node->pkt->pkttype == PKT_PUBLIC_KEY ) {
 		/* do it here, so that debug messages don't clutter the
 		 * output */
-		trust = query_trust_info(pk);
+		trust = query_trust_info(pk, NULL);
 		otrust = get_ownertrust_info( pk->local_id );
 	    }
 
diff --git a/g10/keylist.c b/g10/keylist.c
index 1861cd824..1462dbb2f 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -196,7 +196,7 @@ list_keyblock( KBNODE keyblock, int secret )
 	sk = NULL;
 	keyid_from_pk( pk, keyid );
 	if( opt.with_colons ) {
-	    trustletter = query_trust_info( pk );
+	    trustletter = query_trust_info( pk, NULL );
 	    printf("pub:%c:%u:%d:%08lX%08lX:%s:%s:",
 		    trustletter,
 		    nbits_from_pk( pk ),
@@ -222,8 +222,15 @@ list_keyblock( KBNODE keyblock, int secret )
     for( kbctx=NULL; (node=walk_kbnode( keyblock, &kbctx, 0)) ; ) {
 	if( node->pkt->pkttype == PKT_USER_ID ) {
 	    if( any ) {
-		if( opt.with_colons )
-		    printf("uid:::::::::");
+		if( opt.with_colons ) {
+		    byte namehash[20];
+
+		    rmd160_hash_buffer( namehash,
+					node->pkt->pkt.user_id->name,
+					node->pkt->pkt.user_id->len  );
+		    trustletter = query_trust_info( pk, namehash );
+		    printf("uid:%c::::::::", trustletter);
+		}
 		else
 		    printf("uid%*s", 28, "");
 	    }
diff --git a/g10/mainproc.c b/g10/mainproc.c
index fcb9f5db5..8ef802b63 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -481,7 +481,7 @@ list_node( CTX c, KBNODE node )
 	    keyid_from_pk( pk, keyid );
 	    if( mainkey ) {
 		c->local_id = pk->local_id;
-		c->trustletter = query_trust_info( pk );
+		c->trustletter = query_trust_info( pk, NULL );
 	    }
 	    printf("%s:%c:%u:%d:%08lX%08lX:%s:%s:",
 		    mainkey? "pub":"sub",
diff --git a/g10/pkclist.c b/g10/pkclist.c
index ca22736a7..fffaef821 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -50,7 +50,7 @@ show_paths( ulong lid, int only_first )
     last_level = 0;
     while( (level=enum_cert_paths( &context, &lid, &otrust, &validity)) != -1){
 	char *p;
-	int rc;
+	int c, rc;
 	size_t n;
 	u32 keyid[2];
 	PKT_public_key *pk ;
@@ -77,7 +77,7 @@ show_paths( ulong lid, int only_first )
 		  level*2, "",
 		  nbits_from_pk( pk ), pubkey_letter( pk->pubkey_algo ),
 		  (ulong)keyid[1], lid, datestr_from_pk( pk ) );
-     #if 0
+
 	c = trust_letter(otrust);
 	if( c )
 	    putchar( c );
@@ -90,8 +90,6 @@ show_paths( ulong lid, int only_first )
 	else
 	    printf( "%02x", validity );
 	putchar(' ');
-      #endif
-
 
 	p = get_user_id( keyid, &n );
 	tty_print_string( p, n ),
@@ -230,7 +228,6 @@ _("Could not find a valid trust path to the key.  Let's see whether we\n"
     }
 
     lid = pk->local_id;
-  #if 0  /* FIXME: enable this when trustdb stuff works again */
     while( enum_cert_paths( &context, &lid, &otrust, &validity ) != -1 ) {
 	if( lid == pk->local_id )
 	    continue;
@@ -242,6 +239,7 @@ _("Could not find a valid trust path to the key.  Let's see whether we\n"
 	     * those values from then on
 	     */
 	    otrust = get_ownertrust( lid );
+	    /* fixme: and the validity? */
 	}
 	if( otrust == TRUST_UNDEFINED ) {
 	    any_undefined=1;
@@ -257,7 +255,6 @@ _("Could not find a valid trust path to the key.  Let's see whether we\n"
 	}
     }
     enum_cert_paths( &context, NULL, NULL, NULL ); /* release context */
-  #endif
 
     if( !any )
 	tty_printf(_("No path leading to one of our keys found.\n\n") );
@@ -298,12 +295,14 @@ do_we_trust( PKT_public_key *pk, int trustlevel )
 						      g10_errstr(rc) );
 	    return 0; /* no */
 	}
-	rc = check_trust( pk, &trustlevel );
+	rc = check_trust( pk, &trustlevel, NULL );
 	if( rc )
 	    log_fatal("trust check after insert failed: %s\n",
 						      g10_errstr(rc) );
-	if( trustlevel == TRUST_UNKNOWN || trustlevel == TRUST_EXPIRED )
-	    BUG();
+	if( trustlevel == TRUST_UNKNOWN || trustlevel == TRUST_EXPIRED ) {
+	    log_debug("do_we_trust: oops at %d\n", __LINE__ );
+	    return 0;
+	}
 	return do_we_trust( pk, trustlevel );
 
       case TRUST_EXPIRED:
@@ -320,7 +319,7 @@ do_we_trust( PKT_public_key *pk, int trustlevel )
 
 	    rc = add_ownertrust( pk, &quit );
 	    if( !rc && !quit ) {
-		rc = check_trust( pk, &trustlevel );
+		rc = check_trust( pk, &trustlevel, NULL );
 		if( rc )
 		    log_fatal("trust check after add_ownertrust failed: %s\n",
 							      g10_errstr(rc) );
@@ -431,7 +430,7 @@ check_signatures_trust( PKT_signature *sig )
     }
 
   retry:
-    rc = check_trust( pk, &trustlevel );
+    rc = check_trust( pk, &trustlevel, NULL );
     if( rc ) {
 	log_error("check trust failed: %s\n", g10_errstr(rc));
 	goto leave;
@@ -452,7 +451,7 @@ check_signatures_trust( PKT_signature *sig )
 						      g10_errstr(rc) );
 	    goto leave;
 	}
-	rc = check_trust( pk, &trustlevel );
+	rc = check_trust( pk, &trustlevel, NULL );
 	if( rc )
 	    log_fatal("trust check after insert failed: %s\n",
 						      g10_errstr(rc) );
@@ -592,7 +591,7 @@ build_pk_list( STRLIST remusr, PK_LIST *ret_pk_list, unsigned use )
 	    else if( !(rc=check_pubkey_algo2(pk->pubkey_algo, use)) ) {
 		int trustlevel;
 
-		rc = check_trust( pk, &trustlevel );
+		rc = check_trust( pk, &trustlevel, NULL );
 		if( rc ) {
 		    log_error("error checking pk of `%s': %s\n",
 						      answer, g10_errstr(rc) );
@@ -631,7 +630,7 @@ build_pk_list( STRLIST remusr, PK_LIST *ret_pk_list, unsigned use )
 	    else if( !(rc=check_pubkey_algo2(pk->pubkey_algo, use )) ) {
 		int trustlevel;
 
-		rc = check_trust( pk, &trustlevel );
+		rc = check_trust( pk, &trustlevel, NULL );
 		if( rc ) {
 		    free_public_key( pk ); pk = NULL;
 		    log_error(_("%s: error checking key: %s\n"),
@@ -712,7 +711,7 @@ select_algo_from_prefs( PK_LIST pk_list, int preftype )
 
 	memset( mask, 0, 8 * sizeof *mask );
 	if( !pkr->pk->local_id ) { /* try to set the local id */
-	    query_trust_info( pkr->pk );
+	    query_trust_info( pkr->pk, NULL );
 	    if( !pkr->pk->local_id ) {
 		log_debug("select_algo_from_prefs: can't get LID\n");
 		continue;
diff --git a/g10/seckey-cert.c b/g10/seckey-cert.c
index cab99b65b..661f1da43 100644
--- a/g10/seckey-cert.c
+++ b/g10/seckey-cert.c
@@ -173,7 +173,7 @@ check_secret_key( PKT_secret_key *sk, int n )
 
     for(i=0; i < n && rc == G10ERR_BAD_PASS; i++ ) {
 	if( i )
-	    log_error(_("Invalid passphrase; please try again ...\n"));
+	    log_info(_("Invalid passphrase; please try again ...\n"));
 	rc = do_check( sk );
 	if( have_static_passphrase() )
 	    break;
diff --git a/g10/sig-check.c b/g10/sig-check.c
index 2de2f7818..885a5b587 100644
--- a/g10/sig-check.c
+++ b/g10/sig-check.c
@@ -76,7 +76,7 @@ signature_check( PKT_signature *sig, MD_HANDLE digest )
 	MD_HANDLE md;
 	u32 a = sig->timestamp;
 	int i, nsig = pubkey_get_nsig( sig->pubkey_algo );
-	byte *p;
+	byte *p, *buffer;
 
 	md = md_open( DIGEST_ALGO_RMD160, 0);
 	md_putc( digest, sig->pubkey_algo );
@@ -96,7 +96,10 @@ signature_check( PKT_signature *sig, MD_HANDLE digest )
 	}
 	md_final( md );
 	p = make_radix64_string( md_read( md, 0 ), 20 );
-	write_status_text( STATUS_SIG_ID, p );
+	buffer = m_alloc( strlen(p) + 40 );
+	sprintf( buffer, "%s %s", p, strtimestamp( sig->timestamp ) );
+	write_status_text( STATUS_SIG_ID, buffer );
+	m_free(buffer);
 	m_free(p);
 	md_close(md);
     }
diff --git a/g10/trustdb.c b/g10/trustdb.c
index c40976523..2a37641aa 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -1,5 +1,5 @@
 /* trustdb.c
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -66,25 +66,8 @@ struct local_id_table {
 typedef struct local_id_table *LOCAL_ID_TABLE;
 
 
-typedef struct trust_info TRUST_INFO;
-struct trust_info {
-    ulong    lid;
-    byte     otrust; /* ownertrust (assigned trust) */
-    byte     trust;  /* calculated trust (validity) */
-};
-
-typedef struct trust_seg_list *TRUST_SEG_LIST;
-struct trust_seg_list {
-    TRUST_SEG_LIST next;
-    int  pathlen;
-    TRUST_INFO path[1];
-};
-
-
 struct enum_cert_paths_ctx {
    int init;
-   TRUST_SEG_LIST tsl_head;
-   TRUST_SEG_LIST tsl;
    int idx;
 };
 
@@ -97,6 +80,35 @@ struct recno_list_struct {
 typedef struct recno_list_struct *RECNO_LIST;
 
 
+
+typedef struct trust_node *TN;
+struct trust_node {
+    TN	  back;  /* parent */
+    TN	  list;  /* list of other node (should all be of the same type)*/
+    TN	  next;  /* used to build the list */
+    int   is_uid; /* set if this is an uid node */
+    ulong lid;	 /* key or uid recordnumber */
+    union {
+	struct {
+	    int ownertrust;
+	    int validity;
+	    /* helper */
+	    int buckstop;
+	} k;
+	struct {
+	    int marginal_count;
+	    int fully_count;
+	    int validity;
+	} u;
+    } n;
+};
+
+
+static TN used_tns;
+static int alloced_tns;
+static int max_alloced_tns;
+
+
 static int walk_sigrecs( SIGREC_CONTEXT *c );
 
 static LOCAL_ID_TABLE new_lid_table(void);
@@ -105,11 +117,11 @@ static int ins_lid_table_item( LOCAL_ID_TABLE tbl, ulong lid, unsigned flag );
 static int qry_lid_table_flag( LOCAL_ID_TABLE tbl, ulong lid, unsigned *flag );
 
 
+static int propagate_validity( TN node );
 
 static void print_user_id( const char *text, u32 *keyid );
-static void sort_tsl_list( TRUST_SEG_LIST *trust_seg_list );
 static int list_sigs( ulong pubkey_id );
-static int do_check( TRUSTREC *drec, unsigned *trustlevel );
+static int do_check( TRUSTREC *drec, unsigned *trustlevel, const char *nhash);
 static int get_dir_record( PKT_public_key *pk, TRUSTREC *rec );
 
 static void upd_pref_record( TRUSTREC *urec, u32 *keyid, PKT_signature *sig );
@@ -450,7 +462,7 @@ walk_sigrecs( SIGREC_CONTEXT *c )
  *************	Trust  stuff  ******************
  ***********************************************/
 
-static int
+int
 trust_letter( unsigned value )
 {
     switch( value ) {
@@ -639,35 +651,6 @@ print_user_id( const char *text, u32 *keyid )
     m_free(p);
 }
 
-#if 0
-static int
-print_keyid( FILE *fp, ulong lid )
-{
-    u32 ki[2];
-    if( keyid_from_lid( lid, ki ) )
-	return fprintf(fp, "????????.%lu", lid );
-    else
-	return fprintf(fp, "%08lX.%lu", (ulong)ki[1], lid );
-}
-
-static int
-print_trust( FILE *fp, unsigned trust )
-{
-    int c;
-    switch( trust ) {
-      case TRUST_UNKNOWN:   c = 'o'; break;
-      case TRUST_EXPIRED:   c = 'e'; break;
-      case TRUST_UNDEFINED: c = 'q'; break;
-      case TRUST_NEVER:     c = 'n'; break;
-      case TRUST_MARGINAL:  c = 'm'; break;
-      case TRUST_FULLY:     c = 'f'; break;
-      case TRUST_ULTIMATE:  c = 'u'; break;
-      default: fprintf(fp, "%02x", trust ); return 2;
-    }
-    putc(c, fp);
-    return 1;
-}
-#endif
 
 static int
 print_sigflags( FILE *fp, unsigned flags )
@@ -698,7 +681,7 @@ do_list_sigs( ulong root, ulong pk_lid, int depth,
     sx.lid = pk_lid;
     for(;;) {
 	rc = walk_sigrecs( &sx ); /* should we replace it and use */
-	if( rc )		  /* use a loop like in collect_paths ??*/
+	if( rc )
 	    break;
 	rc = keyid_from_lid( sx.sig_lid, keyid );
 	if( rc ) {
@@ -839,199 +822,45 @@ list_records( ulong lid )
 
 
 
-
-/****************
- * stack is an array of (max_path+1) elements. If trust_seg_head is not
- * NULL it is a pointer to a variable which will receive a linked list
- * of trust paths - The caller has to free the memory.
- */
-static int
-collect_paths( int depth, int max_depth, int all, TRUSTREC *drec,
-	       TRUST_INFO *stack, TRUST_SEG_LIST *trust_seg_head )
+static TN
+new_tn(void)
 {
-    ulong rn, uidrn;
-    int marginal=0;
-    int fully=0;
-    /*LOCAL_ID_TABLE sigs_seen = NULL;*/
-
-    if( depth >= max_depth )  /* max cert_depth reached */
-	return TRUST_UNDEFINED;
-
-    /* loop over all user-ids */
-    /*if( !all ) sigs_seen = new_lid_table();*/
-    for( rn = drec->r.dir.uidlist; rn; rn = uidrn ) {
-	TRUSTREC rec;  /* used for uids and sigs */
-	ulong sigrn;
-
-	read_record( rn, &rec, RECTYPE_UID );
-	uidrn = rec.r.uid.next;
-	if( !(rec.r.uid.uidflags & UIDF_CHECKED) )
-	    continue; /* user id has not been checked */
-	if( !(rec.r.uid.uidflags & UIDF_VALID) )
-	    continue; /* user id is not valid */
-	if( (rec.r.uid.uidflags & UIDF_REVOKED) )
-	    continue; /* user id has been revoked */
-
-	stack[depth].lid = drec->r.dir.lid;
-	stack[depth].otrust = drec->r.dir.ownertrust;
-	stack[depth].trust = 0;
-	{   int i;
-
-	    for(i=0; i < depth; i++ )
-		if( stack[i].lid == drec->r.dir.lid )
-		    return TRUST_UNDEFINED; /* closed (we already visited this lid) */
-	}
-	if( !qry_lid_table_flag( ultikey_table, drec->r.dir.lid, NULL ) ) {
-	    /* we are at the end of a path */
-	    TRUST_SEG_LIST tsl;
-	    int i;
+    TN t;
 
-	    stack[depth].trust = TRUST_ULTIMATE;
-	    stack[depth].otrust = TRUST_ULTIMATE;
-	    if( trust_seg_head ) {
-		/* we can now put copy our current stack to the trust_seg_list */
-		tsl = m_alloc( sizeof *tsl + (depth+1)*sizeof( TRUST_INFO ) );
-		for(i=0; i <= depth; i++ )
-		    tsl->path[i] = stack[i];
-		tsl->pathlen = i;
-		tsl->next = *trust_seg_head;
-		*trust_seg_head = tsl;
-	    }
-	    return TRUST_ULTIMATE;
-	}
-
-
-	/* loop over all signature records of this user id */
-	for( rn = rec.r.uid.siglist; rn; rn = sigrn ) {
-	    int i;
-
-	    read_record( rn, &rec, RECTYPE_SIG );
-	    sigrn = rec.r.sig.next;
-
-	    for(i=0; i < SIGS_PER_RECORD; i++ ) {
-		TRUSTREC tmp;
-		int ot, nt;
-		int unchecked = 0;
-
-		if( !rec.r.sig.sig[i].lid )
-		    continue; /* skip deleted sigs */
-		if( !(rec.r.sig.sig[i].flag & SIGF_CHECKED) ) {
-		    if( !all )
-			continue; /* skip unchecked signatures */
-		    unchecked = 1;
-		}
-		else {
-		    if( !(rec.r.sig.sig[i].flag & SIGF_VALID) )
-			continue; /* skip invalid signatures */
-		    if( (rec.r.sig.sig[i].flag & SIGF_EXPIRED) )
-			continue; /* skip expired signatures */
-		    if( (rec.r.sig.sig[i].flag & SIGF_REVOKED) )
-			continue; /* skip revoked signatures */
-		}
-
-		/* visit every signer only once (a signer may have
-		 * signed more than one user ID)
-		 * if( sigs_seen && ins_lid_table_item( sigs_seen,
-		 *				   rec.r.sig.sig[i].lid, 0) )
-		 *   continue;	we already have this one
-		 */
-		read_record( rec.r.sig.sig[i].lid, &tmp, 0 );
-		if( tmp.rectype != RECTYPE_DIR ) {
-		    if( tmp.rectype != RECTYPE_SDIR )
-			log_info("oops: lid %lu: sig %lu has rectype %d"
-			     " - skipped\n",
-			    drec->r.dir.lid, tmp.recnum, tmp.rectype );
-		    continue;
-		}
-		ot = tmp.r.dir.ownertrust & TRUST_MASK;
-		if( ot >= TRUST_FULLY )
-		    ot = TRUST_FULLY;  /* just in case */
-		nt = collect_paths( depth+1, max_depth, all, &tmp, stack,
-							trust_seg_head );
-		nt &= TRUST_MASK;
-
-		if( nt < TRUST_MARGINAL || unchecked ) {
-		    continue;
-		}
-
-		if( nt == TRUST_ULTIMATE ) {
-		    /* we have signed this key and only in this special case
-		     * we assume that this one is fully trusted */
-		    if( !all ) {
-			/*if( sigs_seen ) release_lid_table( sigs_seen );*/
-			return (stack[depth].trust = TRUST_FULLY);
-		    }
-		}
-
-		if( nt > ot )
-		    nt = ot;
-
-		if( nt >= TRUST_FULLY )
-		    fully++;
-		if( nt >= TRUST_MARGINAL )
-		    marginal++;
-
-		if( fully >= opt.completes_needed
-		    || marginal >= opt.marginals_needed ) {
-		    if( !all ) {
-			/*if( sigs_seen ) release_lid_table( sigs_seen );*/
-			return (stack[depth].trust = TRUST_FULLY);
-		    }
-		}
-	    }
-	}
-    }
-    /*if( sigs_seen ) release_lid_table( sigs_seen ); */
-    if( all && ( fully >= opt.completes_needed
-		 || marginal >= opt.marginals_needed ) ) {
-	return (stack[depth].trust = TRUST_FULLY );
+    if( used_tns ) {
+	t = used_tns;
+	used_tns = t->next;
+	memset( t, 0, sizeof *t );
     }
-    if( marginal ) {
-	return (stack[depth].trust = TRUST_MARGINAL);
-    }
-    return (stack[depth].trust=TRUST_UNDEFINED);
+    else
+	t = m_alloc_clear( sizeof *t );
+    if( ++alloced_tns > max_alloced_tns )
+	max_alloced_tns = alloced_tns;
+    return t;
 }
 
 
-typedef struct {
-    ulong lid;
-    ulong uid;
-    byte uid_flags;
-    byte uid_validity;
-    byte dir_flags;
-    byte ownertrust;
-} CERT_ITEM;
-
-/* structure to hold certification chains. Item[nitems-1] is the
- * ultimateley trusted key, item[0] is the key which
- * is introduced, indices [1,(nitems-2)] are all introducers.
- */
-typedef struct cert_chain *CERT_CHAIN;
-struct cert_chain {
-    CERT_CHAIN next;
-    int dups;
-    int nitems;
-    CERT_ITEM items[1];
-};
-
+static void
+release_tn( TN t )
+{
+    if( t ) {
+	t->next = used_tns;
+	used_tns = t;
+	alloced_tns--;
+    }
+}
 
 
-/****************
- * Copy all items to the set SET_HEAD in a way that the requirements
- * of a CERT_CHAIN are met.
- */
 static void
-add_cert_items_to_set( CERT_CHAIN *set_head, CERT_ITEM *items, int nitems )
+release_tn_tree( TN kr )
 {
-    CERT_CHAIN ac;
-    int i;
+    TN	kr2;
 
-    ac = m_alloc_clear( sizeof *ac + (nitems-1)*sizeof(CERT_ITEM) );
-    ac->nitems = nitems;
-    for(i=0; i < nitems; i++ )
-       ac->items[i] = items[i];
-    ac->next = *set_head;
-    *set_head = ac;
+    for( ; kr; kr = kr2 ) {
+	release_tn_tree( kr->list );
+	kr2 = kr->next;
+	release_tn( kr );
+    }
 }
 
 
@@ -1041,57 +870,51 @@ add_cert_items_to_set( CERT_CHAIN *set_head, CERT_ITEM *items, int nitems )
  * should have been allocated with size max_depth, stack[0] should
  * be setup to the key we are investigating, so the minimal depth
  * we should ever see in this function is 1.
- * Returns: -1 max_depth reached
- *	    0  no paths found
- *	    1  ultimately trusted key found
+ * Returns: a new tree
  * certchain_set must be a valid set or point to NULL; this function
  * may modifiy it.
  */
-static int
-find_cert_chain( ulong lid, int depth, int max_depth,
-		 CERT_ITEM *stack, CERT_CHAIN *cert_chain_set )
+static TN
+build_cert_tree( ulong lid, int depth, int max_depth, TN helproot )
 {
     TRUSTREC dirrec;
     TRUSTREC uidrec;
     ulong uidrno;
+    TN keynode;
 
     if( depth >= max_depth )
-	return -1;
-
-    stack[depth].lid = lid;
-    stack[depth].uid = 0;
+	return NULL;
 
+    keynode = new_tn();
+    if( !helproot )
+	helproot = keynode;
+    keynode->lid = lid;
     if( !qry_lid_table_flag( ultikey_table, lid, NULL ) ) {
 	/* this is an ultimately trusted key;
 	 * which means that we have found the end of the chain:
-	 * copy the chain to the set */
-	add_cert_items_to_set( cert_chain_set, stack, depth+1 );
-	return 1;
+	 * We do this here prior to reading the dir record
+	 * because we don't really need the info from that record */
+	keynode->n.k.ownertrust = TRUST_ULTIMATE;
+	keynode->n.k.buckstop	= 1;
+	return keynode;
     }
-
-
     read_record( lid, &dirrec, 0 );
     if( dirrec.rectype != RECTYPE_DIR ) {
 	if( dirrec.rectype != RECTYPE_SDIR )
 	    log_debug("lid %lu, has rectype %d"
 		      " - skipped\n", lid, dirrec.rectype );
-	return 0;
+	m_free(keynode);
+	return NULL;
     }
-    /* Performance hint: add stuff to ignore this one when the
-     *			 assigned validity of the key is bad   */
-
-    stack[depth].dir_flags = dirrec.r.dir.dirflags;
-    stack[depth].ownertrust = dirrec.r.dir.ownertrust;
+    keynode->n.k.ownertrust = dirrec.r.dir.ownertrust;
 
     /* loop over all user ids */
     for( uidrno = dirrec.r.dir.uidlist; uidrno; uidrno = uidrec.r.uid.next ) {
 	TRUSTREC sigrec;
 	ulong sigrno;
+	TN uidnode = NULL;
 
-	stack[depth].uid = uidrno;
 	read_record( uidrno, &uidrec, RECTYPE_UID );
-	stack[depth].uid_flags = uidrec.r.uid.uidflags;
-	stack[depth].uid_validity = uidrec.r.uid.validity;
 
 	if( !(uidrec.r.uid.uidflags & UIDF_CHECKED) )
 	    continue; /* user id has not been checked */
@@ -1102,7 +925,8 @@ find_cert_chain( ulong lid, int depth, int max_depth,
 
 	/* loop over all signature records */
 	for(sigrno=uidrec.r.uid.siglist; sigrno; sigrno = sigrec.r.sig.next ) {
-	    int i, j;
+	    int i;
+	    TN tn;
 
 	    read_record( sigrno, &sigrec, RECTYPE_SIG );
 
@@ -1117,25 +941,48 @@ find_cert_chain( ulong lid, int depth, int max_depth,
 		    continue; /* skip expired signatures */
 		if( (sigrec.r.sig.sig[i].flag & SIGF_REVOKED) )
 		    continue; /* skip revoked signatures */
-		for(j=0; j < depth; j++ ) {
-		    if( stack[j].lid == sigrec.r.sig.sig[i].lid )
-			break;
+		/* check for cycles */
+		for( tn=keynode; tn && tn->lid != sigrec.r.sig.sig[i].lid;
+							  tn = tn->back )
+		    ;
+		if( tn )
+		    continue; /* cycle found */
+
+		tn = build_cert_tree( sigrec.r.sig.sig[i].lid,
+				      depth+1, max_depth, helproot );
+		if( !tn )
+		    continue; /* cert chain too deep or error */
+
+		if( !uidnode ) {
+		    uidnode = new_tn();
+		    uidnode->back = keynode;
+		    uidnode->lid = uidrno;
+		    uidnode->is_uid = 1;
+		    uidnode->next = keynode->list;
+		    keynode->list = uidnode;
 		}
-		if( j < depth )
-		    continue; /* avoid cycles as soon as possible */
 
-		if( find_cert_chain( sigrec.r.sig.sig[i].lid,
-				     depth+1, max_depth,
-				     stack, cert_chain_set ) > 0 ) {
+		tn->back = uidnode;
+		tn->next = uidnode->list;
+		uidnode->list = tn;
+	      #if 0 /* optimazation - fixme: reenable this later */
+		if( tn->n.k.buckstop ) {
 		    /* ultimately trusted key found:
 		     * no need to check more signatures of this uid */
 		    sigrec.r.sig.next = 0;
 		    break;
 		}
+	      #endif
 	    }
 	} /* end loop over sig recs */
     } /* end loop over user ids */
-    return 0;
+
+    if( !keynode->list ) {
+	release_tn_tree( keynode );
+	keynode = NULL;
+    }
+
+    return keynode;
 }
 
 
@@ -1147,14 +994,33 @@ find_cert_chain( ulong lid, int depth, int max_depth,
  * checking all key signatures up to a some depth.
  */
 static int
-verify_key( int max_depth, TRUSTREC *drec )
+verify_key( int max_depth, TRUSTREC *drec, const char *namehash )
 {
-    TRUST_INFO *tmppath = m_alloc_clear( (max_depth+1)* sizeof *tmppath );
-    int tr;
+    TN tree;
+    int trust;
+
+    tree = build_cert_tree( drec->r.dir.lid, 0, opt.max_cert_depth, NULL );
+    if( !tree )
+	return TRUST_UNDEFINED;
+    trust = propagate_validity( tree );
+    if( namehash ) {
+	/* find the matching user id.
+	 * FIXME: the way we handle this is too inefficient */
+	TN ur;
+	TRUSTREC rec;
 
-    tr = collect_paths( 0, max_depth, 0, drec, tmppath, NULL );
-    m_free( tmppath );
-    return tr;
+	trust = 0;
+	for( ur=tree->list; ur; ur = ur->next ) {
+	    read_record( ur->lid, &rec, RECTYPE_UID );
+	    if( !memcmp( namehash, rec.r.uid.namehash, 20 ) ) {
+		trust = ur->n.u.validity;
+		break;
+	    }
+	}
+    }
+
+    release_tn_tree( tree );
+    return trust;
 }
 
 
@@ -1165,7 +1031,7 @@ verify_key( int max_depth, TRUSTREC *drec )
  * but nothing more is known.
  */
 static int
-do_check( TRUSTREC *dr, unsigned *validity )
+do_check( TRUSTREC *dr, unsigned *validity, const char *namehash )
 {
     if( !dr->r.dir.keylist ) {
 	log_error(_("Ooops, no keys\n"));
@@ -1176,15 +1042,21 @@ do_check( TRUSTREC *dr, unsigned *validity )
 	return G10ERR_TRUSTDB;
     }
 
-    if( tdbio_db_matches_options()
+    if( namehash ) {
+	/* Fixme: use the cache */
+	*validity = verify_key( opt.max_cert_depth, dr, namehash );
+    }
+    else if( tdbio_db_matches_options()
 	&& (dr->r.dir.dirflags & DIRF_VALVALID)
 	&& dr->r.dir.validity )
 	*validity = dr->r.dir.validity;
     else {
-	*validity = verify_key( opt.max_cert_depth, dr );
+	*validity = verify_key( opt.max_cert_depth, dr, NULL );
 	if( (*validity & TRUST_MASK) >= TRUST_UNDEFINED
 	    && tdbio_db_matches_options() ) {
 	    /* update the cached validity value */
+	    /* FIXME: Move this to another place so that we can
+	     * update the validity of the uids too */
 	    dr->r.dir.validity = (*validity & TRUST_MASK);
 	    dr->r.dir.dirflags |= DIRF_VALVALID;
 	    write_record( dr );
@@ -1437,9 +1309,9 @@ import_ownertrust( const char *fname )
 
 
 
-
+#if 0
 static void
-print_path( int pathlen, TRUST_INFO *path, FILE *fp, ulong highlight )
+print_path( int pathlen, TN ME .........., FILE *fp, ulong highlight )
 {
     int rc, c, i;
     u32 keyid[2];
@@ -1475,37 +1347,89 @@ print_path( int pathlen, TRUST_INFO *path, FILE *fp, ulong highlight )
 	putc('\n', fp );
     }
 }
+#endif
+
 
 
 static int
-cmp_tsl_array( const void *xa, const void *xb )
+propagate_validity( TN node )
 {
-    TRUST_SEG_LIST a = *(TRUST_SEG_LIST*)xa;
-    TRUST_SEG_LIST b = *(TRUST_SEG_LIST*)xb;
-    return a->pathlen - b->pathlen;
+    TN kr, ur;
+    int max_validity = 0;
+
+    assert( !node->is_uid );
+    if( node->n.k.ownertrust == TRUST_ULTIMATE ) {
+	/* this is one of our keys */
+	assert( !node->list ); /* This should be a leaf */
+	return TRUST_ULTIMATE;
+    }
+
+    /* loop over all user ids */
+    for( ur=node->list; ur; ur = ur->next ) {
+	assert( ur->is_uid );
+	/* loop over all signators */
+	for(kr=ur->list; kr; kr = kr->next ) {
+	    int val = propagate_validity( kr );
+
+	    if( val == TRUST_ULTIMATE ) {
+		ur->n.u.fully_count = opt.completes_needed;
+	    }
+	    else if( val == TRUST_FULLY ) {
+		if( kr->n.k.ownertrust == TRUST_FULLY )
+		    ur->n.u.fully_count++;
+		else if( kr->n.k.ownertrust == TRUST_MARGINAL )
+		    ur->n.u.marginal_count++;
+	    }
+	}
+	/* fixme: We can move this test into the loop to stop as soon as
+	 * we have a level of FULLY and return from this function
+	 * We dont do this now to get better debug output */
+	if( ur->n.u.fully_count >= opt.completes_needed
+	    || ur->n.u.marginal_count >= opt.marginals_needed )
+	    ur->n.u.validity = TRUST_FULLY;
+	else if( ur->n.u.fully_count || ur->n.u.marginal_count )
+	    ur->n.u.validity = TRUST_MARGINAL;
+
+	if( ur->n.u.validity >= max_validity )
+	    max_validity = ur->n.u.validity;
+    }
+
+    node->n.k.validity = max_validity;
+    return max_validity;
 }
 
 
 static void
-sort_tsl_list( TRUST_SEG_LIST *trust_seg_list )
+print_default_uid( ulong lid )
 {
-    TRUST_SEG_LIST *array, *tail, tsl;
-    size_t n;
+    u32 keyid[2];
+
+    if( !keyid_from_lid( lid, keyid ) )
+	print_user_id( "", keyid );
+}
+
 
-    for(n=0, tsl = *trust_seg_list; tsl; tsl = tsl->next )
-	n++;
-    array = m_alloc( (n+1) * sizeof *array );
-    for(n=0, tsl = *trust_seg_list; tsl; tsl = tsl->next )
-	array[n++] = tsl;
-    array[n] = NULL;
-    qsort( array, n, sizeof *array, cmp_tsl_array );
-    *trust_seg_list = NULL;
-    tail = trust_seg_list;
-    for(n=0; (tsl=array[n]); n++ ) {
-	*tail = tsl;
-	tail = &tsl->next;
-    }
-    m_free( array );
+static void
+dump_tn_tree( int indent, TN tree )
+{
+    TN kr, ur;
+
+    for( kr=tree; kr; kr = kr->next ) {
+	printf("%*s", indent*4, "" );
+	printf("K%lu(ot=%d,val=%d)  ", kr->lid,
+					 kr->n.k.ownertrust,
+					 kr->n.k.validity  );
+	print_default_uid( kr->lid );
+	for( ur=kr->list; ur; ur = ur->next ) {
+	    printf("%*s  ", indent*4, "" );
+	    printf("U%lu(mc=%d,fc=%d,val=%d)\n", ur->lid,
+						 ur->n.u.marginal_count,
+						 ur->n.u.fully_count,
+						 ur->n.u.validity
+					    );
+	    dump_tn_tree( indent+1, ur->list );
+	}
+    }
 }
 
 
@@ -1515,10 +1439,7 @@ list_trust_path( const char *username )
     int rc;
     ulong lid;
     TRUSTREC rec;
-  #if 0
-    TRUST_INFO *tmppath;
-    TRUST_SEG_LIST trust_seg_list, tsl, tsl2;
-  #endif
+    TN tree;
     PKT_public_key *pk = m_alloc_clear( sizeof *pk );
 
     INIT_TRUSTDB();
@@ -1540,49 +1461,12 @@ list_trust_path( const char *username )
     lid = pk->local_id;
     free_public_key( pk );
 
-  #if 0
-    /* collect the paths */
-    tmppath = m_alloc_clear( (opt.max_cert_depth+1)* sizeof *tmppath );
-    trust_seg_list = NULL;
-    collect_paths( 0, opt.max_cert_depth, 1, &rec, tmppath, &trust_seg_list );
-    m_free( tmppath );
-    sort_tsl_list( &trust_seg_list );
-    /* and now print them */
-    for(tsl = trust_seg_list; tsl; tsl = tsl->next ) {
-	print_path( tsl->pathlen, tsl->path, stdout, 0 );
-	if( tsl->next )
-	    putchar('\n');
-    }
-
-    /* release the list */
-    for(tsl = trust_seg_list; tsl; tsl = tsl2 ) {
-	tsl2 = tsl->next;
-	m_free( tsl );
-    }
-    trust_seg_list = NULL;
-  #else /* test code */
-    {
-	CERT_ITEM *stack;
-	CERT_CHAIN chains, r;
-	int i;
-
-	chains = NULL;
-	stack = m_alloc_clear( (opt.max_cert_depth+1)* sizeof *stack );
-	find_cert_chain( lid, 0, opt.max_cert_depth, stack, &chains);
-	m_free( stack );
-	/* dump chains */
-	printf("lid/uid(ownertrust,validity):\n");
-	for(r=chains; r ; r = r->next ) {
-	    printf("chain:" );
-	    for(i=0; i < r->nitems; i++ )
-		printf("  %lu/%lu(%d,%d)", r->items[i].lid, r->items[i].uid,
-			r->items[i].ownertrust,
-			(r->items[i].uid_flags & UIDF_VALVALID )?
-					       r->items[i].uid_validity : 0 );
-	    putchar('\n');
-	}
-    }
-  #endif
+    tree = build_cert_tree( lid, 0, opt.max_cert_depth, NULL );
+    if( tree )
+	propagate_validity( tree );
+    dump_tn_tree( 0, tree );
+    printf("(alloced tns=%d  max=%d)\n", alloced_tns, max_alloced_tns );
+    release_tn_tree( tree );
 }
 
 
@@ -1789,7 +1673,7 @@ update_trustdb( )
  *	     is not necessary to check this if we use a local pubring. Hmmmm.
  */
 int
-check_trust( PKT_public_key *pk, unsigned *r_trustlevel )
+check_trust( PKT_public_key *pk, unsigned *r_trustlevel, const byte *namehash )
 {
     TRUSTREC rec;
     unsigned trustlevel = TRUST_UNKNOWN;
@@ -1839,7 +1723,7 @@ check_trust( PKT_public_key *pk, unsigned *r_trustlevel )
 	 trustlevel = TRUST_EXPIRED;
     }
     else {
-	rc = do_check( &rec, &trustlevel );
+	rc = do_check( &rec, &trustlevel, namehash );
 	if( rc ) {
 	    log_error(_("key %08lX.%lu: trust check failed: %s\n"),
 			    (ulong)keyid[1], pk->local_id, g10_errstr(rc));
@@ -1859,13 +1743,13 @@ check_trust( PKT_public_key *pk, unsigned *r_trustlevel )
 
 
 int
-query_trust_info( PKT_public_key *pk )
+query_trust_info( PKT_public_key *pk, const byte *namehash )
 {
     unsigned trustlevel;
     int c;
 
     INIT_TRUSTDB();
-    if( check_trust( pk, &trustlevel ) )
+    if( check_trust( pk, &trustlevel, namehash ) )
 	return '?';
     if( trustlevel & TRUST_FLAG_REVOKED )
 	return 'r';
@@ -1899,13 +1783,15 @@ int
 enum_cert_paths( void **context, ulong *lid,
 		 unsigned *ownertrust, unsigned *validity )
 {
+    return -1;
+  #if 0
     struct enum_cert_paths_ctx *ctx;
-    TRUST_SEG_LIST tsl;
+    fixme: .....   tsl;
 
     INIT_TRUSTDB();
     if( !lid ) {  /* release the context */
 	if( *context ) {
-	    TRUST_SEG_LIST tsl2;
+	    FIXME: ........tsl2;
 
 	    ctx = *context;
 	    for(tsl = ctx->tsl_head; tsl; tsl = tsl2 ) {
@@ -1918,7 +1804,7 @@ enum_cert_paths( void **context, ulong *lid,
     }
 
     if( !*context ) {
-	TRUST_INFO *tmppath;
+	FIXME .... *tmppath;
 	TRUSTREC rec;
 
 	if( !*lid )
@@ -1927,12 +1813,14 @@ enum_cert_paths( void **context, ulong *lid,
 	ctx = m_alloc_clear( sizeof *ctx );
 	*context = ctx;
 	/* collect the paths */
+      #if 0
 	read_record( *lid, &rec, RECTYPE_DIR );
 	tmppath = m_alloc_clear( (opt.max_cert_depth+1)* sizeof *tmppath );
 	tsl = NULL;
 	collect_paths( 0, opt.max_cert_depth, 1, &rec, tmppath, &tsl );
 	m_free( tmppath );
 	sort_tsl_list( &tsl );
+      #endif
 	/* setup the context */
 	ctx->tsl_head = tsl;
 	ctx->tsl = ctx->tsl_head;
@@ -1956,6 +1844,7 @@ enum_cert_paths( void **context, ulong *lid,
     *lid = tsl->path[ctx->idx].lid;
     ctx->idx++;
     return ctx->idx-1;
+  #endif
 }
 
 
@@ -1966,8 +1855,10 @@ void
 enum_cert_paths_print( void **context, FILE *fp,
 				       int refresh, ulong selected_lid )
 {
+    return;
+  #if 0
     struct enum_cert_paths_ctx *ctx;
-    TRUST_SEG_LIST tsl;
+    FIXME......... tsl;
 
     if( !*context )
 	return;
@@ -2001,6 +1892,7 @@ enum_cert_paths_print( void **context, FILE *fp,
     }
 
     print_path( tsl->pathlen, tsl->path, fp, selected_lid );
+  #endif
 }
 
 
@@ -2035,7 +1927,7 @@ get_ownertrust_info( ulong lid )
  * Return an allocated buffer with the preference values for
  * the key with LID and the userid which is identified by the
  * HAMEHASH or the firstone if namehash is NULL.  ret_n receives
- * the length of the allcoated buffer.	Structure of the buffer is
+ * the length of the allocated buffer.	Structure of the buffer is
  * a repeated sequences of 2 bytes; where the first byte describes the
  * type of the preference and the second one the value.  The constants
  * PREFTYPE_xxxx should be used to reference a type.
@@ -2616,6 +2508,10 @@ upd_uid_record( KBNODE keyblock, KBNODE uidnode, u32 *keyid,
     ulong recno, newrecno;
     int rc;
 
+    if( DBG_TRUST )
+	log_debug("upd_uid_record for %08lX/%02X%02X\n",
+			       (ulong)keyid[1], uidhash[18], uidhash[19]);
+
     /* see whether we already have an uid record */
     rmd160_hash_buffer( uidhash, uid->name, uid->len );
     for( recno=drec->r.dir.uidlist; recno; recno = urec.r.uid.next ) {
@@ -2785,6 +2681,11 @@ upd_pref_record( TRUSTREC *urec, u32 *keyid, PKT_signature *sig )
     byte prefs_rec[200];
     int n_prefs_rec = 0;
 
+    if( DBG_TRUST )
+	log_debug("upd_pref_record for %08lX.%lu/%02X%02X\n",
+			  (ulong)keyid[1], lid, uidhash[18], uidhash[19] );
+
+
     /* check for changed preferences */
     for(k=0; ptable[k].subpkttype; k++ ) {
 	s = parse_sig_subpkt2( sig, ptable[k].subpkttype, &n );
@@ -2884,8 +2785,8 @@ upd_cert_record( KBNODE keyblock, KBNODE signode, u32 *keyid,
      * later.  The problem with this is that we must somewhere store
      * the information about this signature (we need a record id).
      * We do this by using the record type shadow dir, which will
-     * be converted to a dir record as soon as a new public key is
-     * inserted into the trustdb.
+     * be converted to a dir record as soon as the missing public key
+     * gets inserted into the trustdb.
      */
     ulong lid = drec->recnum;
     PKT_signature *sig = signode->pkt->pkt.signature;
@@ -2901,6 +2802,12 @@ upd_cert_record( KBNODE keyblock, KBNODE signode, u32 *keyid,
     int found_delrec = 0;
     int rc;
 
+
+    if( DBG_TRUST )
+	log_debug("upd_cert_record for %08lX.?/%02X%02X/%08lX\n",
+			      (ulong)keyid[1], uidhash[18],
+			       uidhash[19], (ulong)sig->keyid[1] );
+
     delrec.recnum = 0;
 
     /* get the LID of the pubkey of the signature under verification */
@@ -2976,13 +2883,12 @@ upd_cert_record( KBNODE keyblock, KBNODE signode, u32 *keyid,
 			rec.r.sig.sig[i].flag |= SIGF_REVOKED;
 		}
 		else if( rc == G10ERR_NO_PUBKEY ) {
-		  #if 0 /* fixme: For some reason this really happens? */
+		    /* fixme: For some reason this really happens? */
 		    if( (rec.r.sig.sig[i].flag & SIGF_CHECKED) )
 			log_info("sig %08lX.%lu/%02X%02X/%08lX: %s\n",
 				  (ulong)keyid[1], lid, uidhash[18],
 				 uidhash[19], (ulong)sig->keyid[1],
 				 _("Hmmm, public key lost?") );
-		  #endif
 		    rec.r.sig.sig[i].flag = SIGF_NOPUBKEY;
 		    if( revoked )
 			rec.r.sig.sig[i].flag |= SIGF_REVOKED;
@@ -3061,7 +2967,7 @@ upd_cert_record( KBNODE keyblock, KBNODE signode, u32 *keyid,
 	    newflag |= SIGF_REVOKED;
     }
     else if( rc == G10ERR_NO_PUBKEY ) {
-	if( opt.verbose > 1 )
+	if( opt.verbose > 1 || DBG_TRUST )
 	    log_info("sig %08lX.%lu/%02X%02X/%08lX: %s\n",
 		     (ulong)keyid[1], lid, uidhash[18],
 		      uidhash[19], (ulong)sig->keyid[1], g10_errstr(rc) );
@@ -3266,9 +3172,6 @@ insert_trust_record( PKT_public_key *pk )
 
     INIT_TRUSTDB();
 
-    if( pk->local_id )
-	log_bug("pk->local_id=%lu\n", pk->local_id );
-
     fingerprint_from_pk( pk, fingerprint, &fingerlen );
 
     /* fixme: assert that we do not have this record.
@@ -3289,6 +3192,13 @@ insert_trust_record( PKT_public_key *pk )
 	goto leave;
     }
 
+    if( pk->local_id ) {
+	log_debug("insert_trust_reord with pk->local_id=%lu\n", pk->local_id );
+	rc = update_trust_record( keyblock, 1, NULL );
+	release_kbnode( keyblock );
+	return rc;
+    }
+
     /* check that we used the primary key (we are little bit paranoid) */
     {	PKT_public_key *a_pk;
 	u32 akid[2], bkid[2];
diff --git a/g10/trustdb.h b/g10/trustdb.h
index 3dd6b6203..303ffc761 100644
--- a/g10/trustdb.h
+++ b/g10/trustdb.h
@@ -49,8 +49,8 @@ void register_trusted_key( const char *string );
 void check_trustdb( const char *username );
 void update_trustdb( void );
 int init_trustdb( int level, const char *dbname );
-int check_trust( PKT_public_key *pk, unsigned *r_trustlevel );
-int query_trust_info( PKT_public_key *pk );
+int check_trust( PKT_public_key *pk, unsigned *r_trustlevel, const byte* nh );
+int query_trust_info( PKT_public_key *pk, const byte *nh );
 int enum_cert_paths( void **context, ulong *lid,
 		     unsigned *ownertrust, unsigned *validity );
 void enum_cert_paths_print( void **context, FILE *fp,
diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index 78bc0dd69..71fedb1ab 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar  8 20:47:17 CET 1999  Werner Koch  <[email protected]>
+
+	* config.links: Take advantage of the with_symbol_underscore macro.
+	Add support for freebsd 4.
+
 Wed Feb 24 11:07:27 CET 1999  Werner Koch  <[email protected]>
 
 	* mips3/mpih-sub1.S: Removed left over junk in last line. (Should I
diff --git a/mpi/config.links b/mpi/config.links
index 63255a120..4caf2b8d6 100644
--- a/mpi/config.links
+++ b/mpi/config.links
@@ -12,12 +12,12 @@ echo '/* created by config.links - do not edit */' >./mpi/asm-syntax.h
 
 if test "$try_asm_modules" = "yes" ; then
 case "${target}" in
-    i[34]86*-*-freebsd*-elf | i[34]86*-*-freebsd3*)
+    i[34]86*-*-freebsd*-elf | i[34]86*-*-freebsd[34]*)
        echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
        cat  $srcdir/mpi/i386/syntax.h	   >>./mpi/asm-syntax.h
        path="i386"
        ;;
-    i[56]86*-*-freebsd*-elf | i[56]86*-*-freebsd3*)
+    i[56]86*-*-freebsd*-elf | i[56]86*-*-freebsd[34]*)
        echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
        cat  $srcdir/mpi/i386/syntax.h	   >>./mpi/asm-syntax.h
        path="i586 i386"
@@ -168,22 +168,9 @@ else
 fi
 
 
-case "${target}" in
-    *-*-linuxaout* | *-*-linuxoldld* | *-*-linux-gnuoldld*)
-	needs_underscore="y"
-	;;
-    *-*-linux* | *-sysv* | *-solaris* | *-gnu* | *-freebsd*-elf)
-	needs_underscore="n"
-	;;
-    *)
-	needs_underscore="y"
-	;;
-esac
-
-
 # Make sysdep.h
 echo '/* created by config.links - do not edit */' >./mpi/sysdep.h
-if test "$needs_underscore" = "y" ; then
+if test x$ac_cv_sys_symbol_underscore = xyes; then
     cat <<EOF >>./mpi/sysdep.h
 #if __STDC__
 #define C_SYMBOL_NAME(name) _##name
diff --git a/po/de.po b/po/de.po
index ab0d7ad58..a91603523 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-02-19 15:31+0100\n"
+"POT-Creation-Date: 1999-03-08 19:50+0100\n"
 "PO-Revision-Date: 1999-02-21 13:34+0100\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -21,20 +21,21 @@ msgstr ""
 "g10/mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c "
 "g10/sig-check.c g10/sign.c g10/trustdb.c g10/verify.c\n"
 
-#: util/secmem.c:77
+#: util/secmem.c:76
 msgid "Warning: using insecure memory!\n"
 msgstr ""
 "Warnung: Sensible Daten k�nnten auf Platte ausgelagert werden.\n"
 "  Um dies zu vermeiden, kann das Programm suid(root) installiert werden.\n"
 "  Bitte wenden Sie sich hierzu an den Systemadministrator.\n"
 
-#: util/secmem.c:250
+#: util/secmem.c:249
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "Vorgang ist ohne sicheren Hauptspeichern nicht m�glich\n"
 
-#: util/secmem.c:251
+#: util/secmem.c:250
 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"
+msgstr ""
+"(m�glicherweise haben Sie das falsche Programm f�r diese Aufgabe benutzt)\n"
 
 #: util/miscutil.c:143
 msgid "yes"
@@ -261,7 +262,7 @@ msgstr ""
 "BENUTZEN SIE DIE DURCH DIESES PROGRAMM ERZEUGTEN DATEN NICHT!\n"
 "\n"
 
-#: cipher/rndlinux.c:118
+#: cipher/rndlinux.c:114
 #, c-format
 msgid ""
 "\n"
@@ -447,7 +448,10 @@ msgstr "Etwas weniger Infos"
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#. { oDryRun, "dry-run",   0, N_("do not make any changes") },
+#: g10/g10.c:235
+msgid "do not make any changes"
+msgstr "Keine wirklichen �nderungen durchf�hren"
+
 #: g10/g10.c:236
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
@@ -633,122 +637,122 @@ msgstr "Optionendatei '%s': %s\n"
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:796
+#: g10/g10.c:797
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ist kein g�ltiger Zeichensatz.\n"
 
-#: g10/g10.c:836 g10/g10.c:848
+#: g10/g10.c:837 g10/g10.c:849
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sslungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:842 g10/g10.c:854
+#: g10/g10.c:843 g10/g10.c:855
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:857
+#: g10/g10.c:858
 #, 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:859
+#: g10/g10.c:860
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr��er als 0 sein\n"
 
-#: g10/g10.c:861
+#: g10/g10.c:862
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
 
-#: g10/g10.c:863
+#: g10/g10.c:864
 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:866
+#: g10/g10.c:867
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:870
+#: g10/g10.c:871
 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:947
+#: g10/g10.c:948
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:953
+#: g10/g10.c:954
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:961
+#: g10/g10.c:962
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:969
+#: g10/g10.c:970
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:982
+#: g10/g10.c:983
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:995
+#: g10/g10.c:996
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:1009
+#: g10/g10.c:1010
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1022
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:1030
+#: g10/g10.c:1031
 msgid "--edit-key username [commands]"
 msgstr "--edit-key Username [Befehle]"
 
-#: g10/g10.c:1046
+#: g10/g10.c:1047
 msgid "--delete-secret-key username"
 msgstr "--delete-secret-key Username"
 
-#: g10/g10.c:1049
+#: g10/g10.c:1050
 msgid "--delete-key username"
 msgstr "--delete-key Benutzername"
 
-#: g10/encode.c:216 g10/g10.c:1072 g10/sign.c:311
+#: g10/encode.c:222 g10/g10.c:1073 g10/sign.c:311
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: g10/g10.c:1083
+#: g10/g10.c:1084
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [Benutzername] [Keyring]"
 
-#: g10/g10.c:1144
+#: g10/g10.c:1145
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1152
+#: g10/g10.c:1153
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1219
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:1297
+#: g10/g10.c:1298
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:1301
+#: g10/g10.c:1302
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1304 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1305 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht ge�ffnet werden\n"
@@ -826,7 +830,7 @@ msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 
-#: g10/pkclist.c:138
+#: g10/pkclist.c:136
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -835,7 +839,7 @@ msgstr ""
 "Es ist kein \"Owner trust\" f�r %lu definiert:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:148
+#: g10/pkclist.c:146
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -858,29 +862,29 @@ msgstr ""
 " 4 = Ich vertraue ihm vollst�ndig\n"
 " s = Bitte weitere Information anzeigen\n"
 
-#: g10/pkclist.c:157
+#: g10/pkclist.c:155
 msgid " m = back to the main menu\n"
 msgstr " m = Zur�ck zum Men�\n"
 
-#: g10/pkclist.c:159
+#: g10/pkclist.c:157
 msgid " q = quit\n"
 msgstr ""
 
 # valid user replies (not including 1..4)
 #. a string with valid answers
-#: g10/pkclist.c:164
+#: g10/pkclist.c:162
 msgid "sSmMqQ"
 msgstr "sSmMqQ"
 
-#: g10/pkclist.c:168
+#: g10/pkclist.c:166
 msgid "Your decision? "
 msgstr "Ihre Auswahl? "
 
-#: g10/pkclist.c:188
+#: g10/pkclist.c:186
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Zertifikate f�hren zu einem letztlich vertrauensw�rdigen Schl�ssel:\n"
 
-#: g10/pkclist.c:223
+#: g10/pkclist.c:221
 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"
@@ -891,7 +895,7 @@ msgstr ""
 "ermitteln k�nnen.\n"
 "\n"
 
-#: g10/pkclist.c:261
+#: g10/pkclist.c:260
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
@@ -899,7 +903,7 @@ msgstr ""
 "Kein Pfad f�hrt zu einen unserer Schl�sseln.\n"
 "\n"
 
-#: g10/pkclist.c:263
+#: g10/pkclist.c:262
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
@@ -907,7 +911,7 @@ msgstr ""
 "Keine Zertifikate mit undefinierten Vertrauen gefunden.\n"
 "\n"
 
-#: g10/pkclist.c:265
+#: g10/pkclist.c:264
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -915,33 +919,33 @@ msgstr ""
 "Keine \"trust\" Werte ge�ndert.\n"
 "\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:279
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "Schl�ssel %08lX: Schl�ssel wurde widerrufen\n"
 
-#: g10/pkclist.c:286 g10/pkclist.c:381
+#: g10/pkclist.c:285 g10/pkclist.c:397
 msgid "Use this key anyway? "
 msgstr "Diesen Schl�ssel trotzdem benutzen?"
 
-#: g10/pkclist.c:308
+#: g10/pkclist.c:309
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: Schl�ssel ist verfallen!\n"
 
-#: g10/pkclist.c:314
+#: g10/pkclist.c:315
 #, 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:332
+#: g10/pkclist.c:333
 #, 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:338
+#: g10/pkclist.c:339
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -950,18 +954,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:344
+#: g10/pkclist.c:345
 msgid "This key probably belongs to the owner\n"
 msgstr ""
 "Dieser Schl�ssel geh�rt h�chstwahrscheinlich dem angegebenen Besitzer\n"
 
-#: g10/pkclist.c:349
+#: g10/pkclist.c:350
 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:376
+#: g10/pkclist.c:392
 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"
@@ -972,60 +976,60 @@ msgstr ""
 "Wenn Sie *wirklich* wissen, was Sie tun, k�nnen Sie die n�chste\n"
 "Frage mit ja beantworten\n"
 
-#: g10/pkclist.c:385
+#: g10/pkclist.c:405
 msgid "WARNING: Using untrusted key!\n"
 msgstr "WARNUNG: Ein Schl�ssel ohne gesichertes Vertrauen wird benutzt!\n"
 
-#: g10/pkclist.c:421
+#: g10/pkclist.c:441
 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:422
+#: g10/pkclist.c:442
 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:443
+#: g10/pkclist.c:463
 msgid "Note: This key has expired!\n"
 msgstr "Hinweis: Dieser Schl�ssel ist verfallen!\n"
 
-#: g10/pkclist.c:450
+#: g10/pkclist.c:470
 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:452
+#: g10/pkclist.c:472
 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:468
+#: g10/pkclist.c:488
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem Schl�ssel!\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:489
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Die Signatur ist wahrscheinlich eine F�LSCHUNG.\n"
 
-#: g10/pkclist.c:476
+#: g10/pkclist.c:496
 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:479
+#: g10/pkclist.c:499
 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:532 g10/pkclist.c:545 g10/pkclist.c:607 g10/pkclist.c:635
+#: g10/pkclist.c:552 g10/pkclist.c:565 g10/pkclist.c:628 g10/pkclist.c:656
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �bersprungen: %s\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:574
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1033,20 +1037,20 @@ msgstr ""
 "Sie gaben keine User-ID angegeben (Benutzen Sie die Option \"-r\").\n"
 "\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:579
 msgid "Enter the user ID: "
 msgstr "Geben Sie die User-ID ein: "
 
-#: g10/pkclist.c:570
+#: g10/pkclist.c:590
 msgid "No such user ID.\n"
 msgstr "Keine solche User-ID vorhanden.\n"
 
-#: g10/pkclist.c:615
+#: g10/pkclist.c:636
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: Fehler beim Pr�fen des Schl�ssels: %s\n"
 
-#: g10/pkclist.c:641
+#: g10/pkclist.c:662
 msgid "no valid addressees\n"
 msgstr "Keine g�ltigen Adressaten\n"
 
@@ -1198,7 +1202,7 @@ msgstr "Der Schl�ssel verf�llt am %s\n"
 msgid "Is this correct (y/n)? "
 msgstr "Ist dies richtig? (j/n) "
 
-#: g10/keygen.c:582
+#: g10/keygen.c:583
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1214,23 +1218,23 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:593
+#: g10/keygen.c:594
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:597
+#: g10/keygen.c:598
 msgid "Invalid character in name\n"
 msgstr "Ung�ltiges Zeichen im Namen\n"
 
-#: g10/keygen.c:599
+#: g10/keygen.c:600
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:602
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name mu� min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:609
+#: g10/keygen.c:610
 msgid "Email address: "
 msgstr "E-Mail-Adresse: "
 
@@ -1246,7 +1250,12 @@ msgstr "Kommentar: "
 msgid "Invalid character in comment\n"
 msgstr "Ung�ltiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:655
+#: g10/keygen.c:657
+#, c-format
+msgid "You are using the `%s' character set.\n"
+msgstr ""
+
+#: g10/keygen.c:663
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1257,15 +1266,15 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:658
+#: g10/keygen.c:666
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:668
+#: g10/keygen.c:676
 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:720
+#: g10/keygen.c:728
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1273,11 +1282,11 @@ msgstr ""
 "Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu sch�tzen.\n"
 "\n"
 
-#: g10/keyedit.c:389 g10/keygen.c:728
+#: g10/keyedit.c:389 g10/keygen.c:736
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen.\n"
 
-#: g10/keygen.c:734
+#: g10/keygen.c:742
 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"
@@ -1290,7 +1299,7 @@ msgstr ""
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:755
+#: g10/keygen.c:763
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (work in another window, move the mouse, utilize the\n"
@@ -1301,34 +1310,34 @@ msgstr ""
 "unterst�tzen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
 "tippen oder irgendwelche anderen Programme benutzen.\n"
 
-#: g10/keygen.c:825
+#: g10/keygen.c:833
 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:833
+#: g10/keygen.c:841
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Der DSA Schl�ssel wird 1024 Bits haben.\n"
 
-#: g10/keygen.c:839
+#: g10/keygen.c:847
 msgid "Key generation cancelled.\n"
 msgstr "Schl�sselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:849
+#: g10/keygen.c:857
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "schreiben des �ffentlichen Zertifikats nach '%s'\n"
 
-#: g10/keygen.c:850
+#: g10/keygen.c:858
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "schreiben des geheimen Zertifikats nach '%s'\n"
 
-#: g10/keygen.c:927
+#: g10/keygen.c:935
 msgid "public and secret key created and signed.\n"
 msgstr "�ffentlichen und geheimen Schl�ssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:929
+#: g10/keygen.c:937
 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"
@@ -1337,20 +1346,20 @@ 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:943 g10/keygen.c:1042
+#: g10/keygen.c:951 g10/keygen.c:1050
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:987 g10/sig-check.c:172 g10/sign.c:52
+#: g10/keygen.c:995 g10/sig-check.c:209 g10/sign.c:52
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
-"Der Schl�ssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder "
-"Uhren stimmen nicht �berein)\n"
+"Der Schl�ssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
+"stimmen nicht �berein)\n"
 
-#: g10/keygen.c:989 g10/sig-check.c:174 g10/sign.c:54
+#: g10/keygen.c:997 g10/sig-check.c:211 g10/sign.c:54
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1358,11 +1367,11 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht �berein)\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:1028
 msgid "Really create? "
 msgstr "Wirklich erzeugen? "
 
-#: g10/encode.c:88 g10/openfile.c:86 g10/openfile.c:169 g10/tdbio.c:467
+#: g10/encode.c:88 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
 #: g10/tdbio.c:527
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1373,17 +1382,17 @@ msgstr "%s: kann nicht ge�ffnet werden: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen des Mantras: %s\n"
 
-#: g10/encode.c:155 g10/encode.c:269
+#: g10/encode.c:161 g10/encode.c:275
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: WARNUNG: Leere Datei\n"
 
-#: g10/encode.c:222
+#: g10/encode.c:228
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Lesen von '%s'\n"
 
-#: g10/encode.c:397
+#: g10/encode.c:403
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s verschl�sselt f�r: %s\n"
@@ -1415,13 +1424,13 @@ msgstr "zu viele Eintr�ge im pk-Lager - abgeschaltet\n"
 msgid "too many entries in unk cache - disabled\n"
 msgstr "zu viele Eintr�ge im unk-Lager - abgeschaltet\n"
 
-#: g10/getkey.c:1496 g10/getkey.c:1552
+#: g10/getkey.c:1502 g10/getkey.c:1558
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr ""
 "der Zweitschl�ssel %08lX wird anstelle des Hauptschl�ssels %08lX verwendet\n"
 
-#: g10/import.c:116 g10/trustdb.c:1318
+#: g10/import.c:116 g10/trustdb.c:1228
 #, c-format
 msgid "can't open file: %s\n"
 msgstr "Kann die Datei nicht �ffnen: %s\n"
@@ -1431,12 +1440,12 @@ msgstr "Kann die Datei nicht �ffnen: %s\n"
 msgid "skipping block of type %d\n"
 msgstr "�berspringe den Block vom Typ %d\n"
 
-#: g10/import.c:167 g10/trustdb.c:1635 g10/trustdb.c:1704
+#: g10/import.c:167 g10/trustdb.c:1564 g10/trustdb.c:1637
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu Schl�ssel bislang bearbeitet\n"
 
-#: g10/import.c:172 g10/trustdb.c:1394
+#: g10/import.c:172 g10/trustdb.c:1304
 #, c-format
 msgid "read error: %s\n"
 msgstr "Lesefehler: %s\n"
@@ -1519,7 +1528,7 @@ msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel nicht gefunden: %s\n"
 msgid "no default public keyring\n"
 msgstr "Kein voreingestellter �ffentlicher Schl�sselbund\n"
 
-#: g10/import.c:374 g10/openfile.c:113 g10/sign.c:215 g10/sign.c:601
+#: g10/import.c:374 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:498
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
@@ -2091,71 +2100,75 @@ msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
 msgid "No user id with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1372
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Kein Zweitschl�ssel mit Index %d\n"
 
-#: g10/mainproc.c:199
+#: g10/mainproc.c:202
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit �ffentlichem Sch�ssel verschl�sselte Daten: Korrekte DEK\n"
 
-#: g10/mainproc.c:202
+#. 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 conetxt.  do_proc_packets can then use
+#. * this list to display some information
+#: g10/mainproc.c:209
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschl�sselung mit �ffentlichem Schl�ssel fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:229
+#: g10/mainproc.c:236
 msgid "decryption okay\n"
 msgstr "Enschl�sselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:232
+#: g10/mainproc.c:239
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Enschl�sselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:249
+#: g10/mainproc.c:256
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:251
+#: g10/mainproc.c:258
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Urspr�nglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:831
+#: g10/mainproc.c:839
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-�berpr�fung unterdr�ckt\n"
 
-#: g10/mainproc.c:837
+#: g10/mainproc.c:845
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Unterschrieben am %.*s mit %s Schl�ssel %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:863 g10/mainproc.c:874
+#: g10/mainproc.c:871 g10/mainproc.c:882
 msgid "BAD signature from \""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:864 g10/mainproc.c:875
+#: g10/mainproc.c:872 g10/mainproc.c:883
 msgid "Good signature from \""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:866
-msgid  "                aka \""
+#: g10/mainproc.c:874
+msgid "                aka \""
 msgstr "                alias \""
 
-#: g10/mainproc.c:908
+#: g10/mainproc.c:916
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Signatur kann nicht gepr�ft werden: %s\n"
 
-#: g10/mainproc.c:981
+#: g10/mainproc.c:989
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:986
+#: g10/mainproc.c:994
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
 
@@ -2276,29 +2289,29 @@ msgstr ""
 "WARNUNG: Unsicherer Schl�ssel entdeckt -\n"
 "         bitte das Mantra nochmal eingeben.\n"
 
-#: g10/sig-check.c:155
+#: g10/sig-check.c:192
 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:163
+#: g10/sig-check.c:200
 #, fuzzy, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "lid %lu: User-ID ohne Signatur\n"
 
-#: g10/sig-check.c:164
+#: g10/sig-check.c:201
 #, fuzzy, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "lid %lu: User-ID ohne Signatur\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:217
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "Hinweis: Schl�ssel der Signatur ist verfallen am %s.\n"
 
-#: g10/sig-check.c:237
+#: g10/sig-check.c:274
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "Vermutlich eine FALSCHE Unterschrift, wegen unbekanntem \"critical bit\"\n"
@@ -2308,7 +2321,7 @@ msgstr ""
 msgid "%s signature from: %s\n"
 msgstr "%s Unterschrift von: %s\n"
 
-#: g10/sign.c:210 g10/sign.c:596
+#: g10/sign.c:210 g10/sign.c:493
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s kann nicht erzeugt werden: %s\n"
@@ -2322,11 +2335,16 @@ msgstr "unterschreibe:"
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
 
-#: g10/textfilter.c:199
+#: g10/textfilter.c:122
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr ""
 
+#: g10/textfilter.c:189
+#, c-format
+msgid "input line longer than %d characters\n"
+msgstr ""
+
 #: g10/tdbio.c:117 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
@@ -2346,12 +2364,12 @@ msgstr "trustdb Transaktion zu gro�\n"
 msgid "%s: can't access: %s\n"
 msgstr "%s: kann nicht zugegriffen werden: %s\n"
 
-#: g10/ringedit.c:294 g10/tdbio.c:444
+#: g10/ringedit.c:296 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: Verzeichnis kann nicht erzeugt werden: %s\n"
 
-#: g10/ringedit.c:300 g10/tdbio.c:447
+#: g10/ringedit.c:302 g10/tdbio.c:447
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: Verzeichnis erzeugt\n"
@@ -2361,7 +2379,7 @@ msgstr "%s: Verzeichnis erzeugt\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: Verzeichnis existiert nicht!\n"
 
-#: g10/openfile.c:109 g10/openfile.c:176 g10/ringedit.c:1310 g10/tdbio.c:457
+#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1325 g10/tdbio.c:457
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: kann nicht erzeugt werden: %s\n"
@@ -2457,171 +2475,171 @@ msgstr "%s: konnte einen Satz nicht Nullen: %s\n"
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: konnte Satz nicht anh�ngen: %s\n"
 
-#: g10/trustdb.c:144
+#: g10/trustdb.c:165
 msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
 msgstr ""
 "Die \"Trust\"-Datenbank ist besch�digt; verwenden Sie \"gpgm "
 "--fix-trustdb\".\n"
 
-#: g10/trustdb.c:157
+#: g10/trustdb.c:178
 #, 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:193
 #, 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:207
 #, 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:221
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:329
+#: g10/trustdb.c:351
 #, 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:336
+#: g10/trustdb.c:358
 #, 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:341
+#: g10/trustdb.c:363
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "Kein Hauptschl�ssel f�r LID %lu\n"
 
-#: g10/trustdb.c:346
+#: g10/trustdb.c:368
 #, 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:422
+#: g10/trustdb.c:445
 #, c-format
 msgid "chained sigrec %lu has a wrong owner\n"
 msgstr "Verketteter Signatursatz %lu hat einen falschen Besitzer\n"
 
-#: g10/trustdb.c:465
+#: g10/trustdb.c:488
 #, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "'%s' ist keine g�ltige lange Schl�ssel-ID\n"
 
-#: g10/trustdb.c:500
+#: g10/trustdb.c:523
 #, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: kein �ffentlicher Sch�ssel f�r vertrauensw�rdigen Schl�ssel "
 "- �bersprungen\n"
 
-#: g10/trustdb.c:509 g10/trustdb.c:567
+#: g10/trustdb.c:532 g10/trustdb.c:590
 #, 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:514 g10/trustdb.c:573
+#: g10/trustdb.c:537 g10/trustdb.c:596
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "Schl�ssel %08lX: Satzabfrage fehlgeschlagen\n"
 
-#: g10/trustdb.c:519 g10/trustdb.c:582
+#: g10/trustdb.c:542 g10/trustdb.c:605
 #, 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:522 g10/trustdb.c:585
+#: g10/trustdb.c:545 g10/trustdb.c:608
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "Schl�ssel %08lX: Akzeptiert als vertrauensw�rdiger Schl�ssel.\n"
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:561
 #, 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:550
+#: g10/trustdb.c:573
 #, 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:557
+#: g10/trustdb.c:580
 #, 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:593
+#: g10/trustdb.c:616
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enum_secret_keys fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:776
+#: g10/trustdb.c:770
 #, c-format
 msgid "lid %lu: read dir record failed: %s\n"
 msgstr "lid %lu: Lesen des Verz.Satzes fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:785
+#: g10/trustdb.c:779
 #, c-format
 msgid "lid %lu: read key record failed: %s\n"
 msgstr "lid %lu: Lesen des Schl..Satzes fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:795
+#: g10/trustdb.c:789
 #, c-format
 msgid "lid %lu: read uid record failed: %s\n"
 msgstr "lid %lu: Lesen des UserID-Satzes fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:804
+#: g10/trustdb.c:798
 #, c-format
 msgid "lid %lu: read pref record failed: %s\n"
 msgstr "lid %lu: Lesen des Pref.Satzes fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:814
+#: g10/trustdb.c:808
 #, c-format
 msgid "lid %lu: read sig record failed: %s\n"
 msgstr "lid %lu: Lesen des Sig.Satzes fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1151
+#: g10/trustdb.c:1037
 msgid "Ooops, no keys\n"
 msgstr "Huch, keine Schl�ssel\n"
 
-#: g10/trustdb.c:1155
+#: g10/trustdb.c:1041
 msgid "Ooops, no user ids\n"
 msgstr "Huch, keine User-IDs\n"
 
-#: g10/trustdb.c:1226 g10/trustdb.c:1244
+#: g10/trustdb.c:1134 g10/trustdb.c:1152
 #, c-format
 msgid "user '%s' read problem: %s\n"
 msgstr "User '%s' Leseproblem: %s\n"
 
-#: g10/trustdb.c:1229 g10/trustdb.c:1247
+#: g10/trustdb.c:1137 g10/trustdb.c:1155
 #, c-format
 msgid "user '%s' list problem: %s\n"
 msgstr "User '%s' Listenproblem: %s\n"
 
-#: g10/trustdb.c:1237 g10/trustdb.c:1485
+#: g10/trustdb.c:1145 g10/trustdb.c:1447
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "Benutzer '%s' nicht gefunden: %s\n"
 
-#: g10/trustdb.c:1239 g10/trustdb.c:1487
+#: g10/trustdb.c:1147 g10/trustdb.c:1449
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "Problem, '%s' in der Trust-DB zu finden: %s\n"
 
-#: g10/trustdb.c:1242
+#: g10/trustdb.c:1150
 #, c-format
 msgid "user '%s' not in trustdb\n"
 msgstr "User '%s' ist nicht in der trustdb\n"
 
-#: g10/trustdb.c:1277
+#: g10/trustdb.c:1186
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -2630,384 +2648,384 @@ msgstr ""
 "# Liste der zugewisenen \"trustvalues\", erzeugt am %s\n"
 "# (Verwenden Sie \"gpgm --import-ownertrust\" um sie wieder einzuspielen)\n"
 
-#: g10/trustdb.c:1283
+#: g10/trustdb.c:1192
 msgid "directory record w/o primary key\n"
 msgstr "Verzeichnis-Satz ohne Hauptschl�ssel\n"
 
-#: g10/trustdb.c:1290
+#: g10/trustdb.c:1199
 #, c-format
 msgid "error reading key record: %s\n"
 msgstr "Fehler beim Lesen des Schl.Satzes: %s\n"
 
-#: g10/trustdb.c:1330
+#: g10/trustdb.c:1240
 msgid "line too long\n"
 msgstr "Zeile zu lang\n"
 
-#: g10/trustdb.c:1338
+#: g10/trustdb.c:1248
 msgid "error: missing colon\n"
 msgstr "Fehler: Fehlender Doppelpunkt\n"
 
-#: g10/trustdb.c:1343
+#: g10/trustdb.c:1253
 msgid "error: invalid fingerprint\n"
 msgstr "Fehler: ung�ltiger Fingerabdruck\n"
 
-#: g10/trustdb.c:1347
+#: g10/trustdb.c:1257
 msgid "error: no ownertrust value\n"
 msgstr "Fehler: Keine \"Owner trust\" Werte\n"
 
-#: g10/trustdb.c:1372
+#: g10/trustdb.c:1282
 msgid "key not in trustdb, searching ring.\n"
 msgstr "Schl�ssel ist nicht in der trustdb, Schl.bund wird durchsucht.\n"
 
-#: g10/trustdb.c:1375
+#: g10/trustdb.c:1285
 #, c-format
 msgid "key not in ring: %s\n"
 msgstr "Schl�ssel ist nicht im Schl�sselbund: %s\n"
 
-#: g10/trustdb.c:1379
+#: g10/trustdb.c:1289
 msgid "Oops: key is now in trustdb???\n"
 msgstr "Huch: Schl�ssel ist ja gar nicht in der Trust-DB?\n"
 
 #. update the ownertrust
-#: g10/trustdb.c:1384
+#: g10/trustdb.c:1294
 #, c-format
 msgid "insert trust record failed: %s\n"
 msgstr "'trust record' einf�gen fehlgeschlagen: %s\n"
 
 #. error
-#: g10/trustdb.c:1390
+#: g10/trustdb.c:1300
 #, c-format
 msgid "error finding dir record: %s\n"
 msgstr "Fehler beim Auffinden des Verz.Satzes: %s\n"
 
-#: g10/trustdb.c:1490
+#: g10/trustdb.c:1452
 #, 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:1493
+#: g10/trustdb.c:1455
 #, 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:1565
+#: g10/trustdb.c:1494
 #, c-format
 msgid "%s: keyblock read problem: %s\n"
 msgstr "%s: Schl�sselblock Leseproblem: %s\n"
 
-#: g10/trustdb.c:1579
+#: g10/trustdb.c:1508
 #, c-format
 msgid "%s: update failed: %s\n"
 msgstr "%s: �nderung fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1582
+#: g10/trustdb.c:1511
 #, c-format
 msgid "%s: updated\n"
 msgstr "%s: ge�ndert\n"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1513
 #, c-format
 msgid "%s: okay\n"
 msgstr "%s: In Ordnung\n"
 
-#: g10/trustdb.c:1599
+#: g10/trustdb.c:1528
 #, 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:1612
+#: g10/trustdb.c:1541
 #, c-format
 msgid "lid %lu: keyblock not found: %s\n"
 msgstr "lid %lu: Schl�sselblock nicht gefunden: %s\n"
 
-#: g10/trustdb.c:1621 g10/trustdb.c:1690
+#: g10/trustdb.c:1550 g10/trustdb.c:1623
 #, c-format
 msgid "lid %lu: update failed: %s\n"
 msgstr "lid %lu: �nderung fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1627 g10/trustdb.c:1696
+#: g10/trustdb.c:1556 g10/trustdb.c:1629
 #, c-format
 msgid "lid %lu: updated\n"
 msgstr "lid %lu: ge�ndert\n"
 
-#: g10/trustdb.c:1631 g10/trustdb.c:1700
+#: g10/trustdb.c:1560 g10/trustdb.c:1633
 #, c-format
 msgid "lid %lu: okay\n"
 msgstr "lid %lu: In Ordnung\n"
 
-#: g10/trustdb.c:1638 g10/trustdb.c:1706
+#: g10/trustdb.c:1567 g10/trustdb.c:1639
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu Schl�ssel bearbeitet\n"
 
-#: g10/trustdb.c:1640
+#: g10/trustdb.c:1569
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu Schl�ssel �bersprungen\n"
 
-#: g10/trustdb.c:1642 g10/trustdb.c:1708
+#: g10/trustdb.c:1571 g10/trustdb.c:1641
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu Schl�ssel mit Fehlern\n"
 
-#: g10/trustdb.c:1644 g10/trustdb.c:1710
+#: g10/trustdb.c:1573 g10/trustdb.c:1643
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu Schl�ssel ge�ndert\n"
 
-#: g10/trustdb.c:1674
+#: g10/trustdb.c:1607
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: Einf�gen fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1679
+#: g10/trustdb.c:1612
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: Einf�gen fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1685
+#: g10/trustdb.c:1618
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: eingef�gt\n"
 
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1645
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu Schl�ssel eingef�gt\n"
 
-#: g10/trustdb.c:1715
+#: g10/trustdb.c:1648
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumerate Schl�sselblock fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1760
+#: g10/trustdb.c:1694
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: Suche nach Dir-Satz fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1767
+#: g10/trustdb.c:1701
 #, 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:1771
+#: g10/trustdb.c:1705
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "Schl�ssel %08lX.%lu: in \"trustdb\" eingef�gt\n"
 
-#: g10/trustdb.c:1779
+#: g10/trustdb.c:1713
 #, 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:1786
+#: g10/trustdb.c:1720
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "Schl�ssel %08lX.%lu: verfallen am %s\n"
 
-#: g10/trustdb.c:1794
+#: g10/trustdb.c:1728
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "Schl�ssel %08lX.%lu: Vertrauenspr�fung fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:2003 g10/trustdb.c:2032 g10/trustdb.c:2771
+#: g10/trustdb.c:1951 g10/trustdb.c:1981 g10/trustdb.c:2734
 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:2054
+#: g10/trustdb.c:2003
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:2117
+#: g10/trustdb.c:2071
 #, c-format
 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"
 
-#: g10/trustdb.c:2121
+#: g10/trustdb.c:2075
 #, c-format
 msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n"
 msgstr "Hinweis: sig rec %lu[%d] in hintlist of %lu but not marked\n"
 
 #. we need the dir record
-#: g10/trustdb.c:2128
+#: g10/trustdb.c:2082
 #, c-format
 msgid "sig rec %lu[%d] in hintlist of %lu does not point to a dir record\n"
 msgstr "sig rec %lu[%d] in hintlist of %lu does not point to a dir record\n"
 
-#: g10/trustdb.c:2134
+#: g10/trustdb.c:2088
 #, c-format
 msgid "lid %lu: no primary key\n"
 msgstr "lid %lu: kein Hauptschl�ssel\n"
 
-#: g10/trustdb.c:2167
+#: g10/trustdb.c:2121
 #, c-format
 msgid "lid %lu: user id not found in keyblock\n"
 msgstr "lid %lu: User-ID im Schl�sselblock nicht gefunden\n"
 
-#: g10/trustdb.c:2171
+#: g10/trustdb.c:2125
 #, c-format
 msgid "lid %lu: user id without signature\n"
 msgstr "lid %lu: User-ID ohne Signatur\n"
 
-#: g10/trustdb.c:2178
+#: g10/trustdb.c:2132
 #, c-format
 msgid "lid %lu: self-signature in hintlist\n"
 msgstr "lid %lu: Eigenbeglaubigung in 'hintlist'\n"
 
-#: g10/trustdb.c:2189 g10/trustdb.c:2910 g10/trustdb.c:2994
+#: g10/trustdb.c:2143 g10/trustdb.c:2879 g10/trustdb.c:2962
 msgid "Valid certificate revocation"
 msgstr "G�ltiger Zerifikat-Widerruf"
 
-#: g10/trustdb.c:2190 g10/trustdb.c:2911 g10/trustdb.c:2995
+#: g10/trustdb.c:2144 g10/trustdb.c:2880 g10/trustdb.c:2963
 msgid "Good certificate"
 msgstr "Korrektes Zertifikat"
 
-#: g10/trustdb.c:2199
+#: g10/trustdb.c:2153
 msgid "very strange: no public key\n"
 msgstr "sehr seltsam: kein �ffentlicher Schl�ssel\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2201
 #, c-format
 msgid "hintlist %lu[%d] of %lu does not point to a dir record\n"
 msgstr "hintlist %lu[%d] of %lu zeigt nicht auf einen 'dir record'\n"
 
-#: g10/trustdb.c:2253
+#: g10/trustdb.c:2207
 #, c-format
 msgid "lid %lu does not have a key\n"
 msgstr "lid %lu hat keinen Schl�ssel\n"
 
-#: g10/trustdb.c:2263
+#: g10/trustdb.c:2217
 #, c-format
 msgid "lid %lu: can't get keyblock: %s\n"
 msgstr "lid %lu: Schl�sselblock nicht verf�gbar: %s\n"
 
-#: g10/trustdb.c:2320 g10/trustdb.c:3245
+#: g10/trustdb.c:2274 g10/trustdb.c:3227
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:2473
+#: g10/trustdb.c:2427
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "Schl�ssel %08lX.%lu: Korrekte Unterschl�ssel-Anbindung\n"
 
-#: g10/trustdb.c:2479 g10/trustdb.c:2521
+#: g10/trustdb.c:2433 g10/trustdb.c:2475
 #, 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:2494
+#: g10/trustdb.c:2448
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "Schl�ssel %08lX.%lu: G�ltiger Schl�sselwiderruf\n"
 
-#: g10/trustdb.c:2500
+#: g10/trustdb.c:2454
 #, 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:2515
+#: g10/trustdb.c:2469
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "Schl�ssel %08lX.%lu: G�ltiger Unterschl�sselwiderruf\n"
 
-#: g10/trustdb.c:2615
+#: g10/trustdb.c:2573
 msgid "Good self-signature"
 msgstr "Korrekte Eigenbeglaubigung"
 
-#: g10/trustdb.c:2626
+#: g10/trustdb.c:2584
 msgid "Invalid self-signature"
 msgstr "Ung�ltige Eigenbeglaubigung"
 
-#: g10/trustdb.c:2636
+#: g10/trustdb.c:2594
 msgid "Valid user ID revocation skipped due to a newer self signature\n"
 msgstr ""
 "G�ltiger User-ID-Widerruf ignoriert, da eine neuere Eigenbeglaubigung "
 "vorliegt\n"
 
-#: g10/trustdb.c:2643
+#: g10/trustdb.c:2601
 msgid "Valid user ID revocation\n"
 msgstr "G�ltiger User-ID-Widerruf\n"
 
-#: g10/trustdb.c:2650
+#: g10/trustdb.c:2608
 msgid "Invalid user ID revocation"
 msgstr "Ung�ltiger User-ID-Widerruf"
 
-#: g10/trustdb.c:2734
+#: g10/trustdb.c:2697
 msgid "Too many preferences"
 msgstr "Zu viele Einstellungen"
 
-#: g10/trustdb.c:2748
+#: g10/trustdb.c:2711
 msgid "Too many preference items"
 msgstr "Zu viele Angaben zur Bevorzugung"
 
-#: g10/trustdb.c:2888
+#: g10/trustdb.c:2857
 #, fuzzy
 msgid "duplicated certificate - deleted"
 msgstr "Doppelte Zertifikate - entfernt"
 
-#: g10/trustdb.c:2922
+#: g10/trustdb.c:2891
 msgid "Hmmm, public key lost?"
 msgstr "Hmmm, �ffentlicher Sch�ssel verloren?"
 
-#: g10/trustdb.c:2932 g10/trustdb.c:3015
+#: g10/trustdb.c:2900 g10/trustdb.c:2983
 msgid "Invalid certificate revocation"
 msgstr "Ung�ltiger Zertifikatswiderruf"
 
-#: g10/trustdb.c:2933 g10/trustdb.c:3016
+#: g10/trustdb.c:2901 g10/trustdb.c:2984
 msgid "Invalid certificate"
 msgstr "Ung�ltiges Zertifikat"
 
-#: g10/trustdb.c:2948
+#: g10/trustdb.c:2916
 #, c-format
 msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n"
 msgstr ""
 "uid %08lX.%lu/%02X%02X: hat \"shadow-dir\" %lu, aber ist noch nicht "
 "markiert.\n"
 
-#: g10/trustdb.c:2962
+#: g10/trustdb.c:2930
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "Signatursatz %lu[%d] zeigt auf falschen Satz.\n"
 
 #. that should never happen
-#: g10/trustdb.c:3215
+#: g10/trustdb.c:3190
 #, c-format
 msgid "insert_trust_record: keyblock not found: %s\n"
 msgstr "insert_trust_record: Schl�sselblock nicht gefunden: %s\n"
 
-#: g10/trustdb.c:3233
+#: g10/trustdb.c:3215
 msgid "did not use primary key for insert_trust_record()\n"
 msgstr "F�r insert_trust_record() wurde nicht der Hauptschl�ssel benutzt\n"
 
-#: g10/ringedit.c:314
+#: g10/ringedit.c:316
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: Schl�sselbund kann nicht erzeugt werden: %s\n"
 
-#: g10/ringedit.c:320 g10/ringedit.c:1315
+#: g10/ringedit.c:322 g10/ringedit.c:1330
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Schl�sselbund erstellt\n"
 
-#: g10/ringedit.c:1492
+#: g10/ringedit.c:1507
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "Warnung: Zwei Dateien mit vertraulichem Inhalt vorhanden.\n"
 
-#: g10/ringedit.c:1493
+#: g10/ringedit.c:1508
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ist der Unver�nderte\n"
 
-#: g10/ringedit.c:1494
+#: g10/ringedit.c:1509
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ist der Neue\n"
 
-#: g10/ringedit.c:1495
+#: g10/ringedit.c:1510
 msgid "Please fix this possible security flaw\n"
 msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n"
 
@@ -3043,12 +3061,12 @@ msgstr "�berschreiben (j/N)? "
 msgid "writing to stdout\n"
 msgstr "Schreiben auf die Standardausgabe\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "die unterzeichneten Daten sind wohl in '%s'\n"
 
-#: g10/openfile.c:192
+#: g10/openfile.c:197
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: neue Optionendatei erstellt\n"
@@ -3388,9 +3406,6 @@ msgstr "Keine Hilfe f�r '%s' vorhanden."
 #~ msgid "edit a key signature"
 #~ msgstr "Bearbeiten der Signaturen eines Schl�ssels"
 
-#~ msgid "do not make any changes"
-#~ msgstr "Keine wirklichen �nderungen durchf�hren"
-
 #~ msgid ""
 #~ "It's up to you to assign a value here; this value will never be exported\n"
 #~ "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index 32cb72a5d..c6eda905d 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -5,7 +5,7 @@
 # I also got inspiration from it.po by Marco d'Itri <[email protected]>
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-02-19 15:31+0100\n"
+"POT-Creation-Date: 1999-03-08 19:50+0100\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-13 10:49:25+0100\n"
 "From: Urko Lusa <[email protected]>\n"
@@ -19,15 +19,15 @@ msgstr ""
 "g10/mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c "
 "g10/sig-check.c g10/sign.c g10/trustdb.c g10/verify.c\n"
 
-#: util/secmem.c:77
+#: util/secmem.c:76
 msgid "Warning: using insecure memory!\n"
 msgstr "Aviso: �se est� usando memoria insegura!\n"
 
-#: util/secmem.c:250
+#: util/secmem.c:249
 msgid "operation is not possible without initialized secure memory\n"
 msgstr ""
 
-#: util/secmem.c:251
+#: util/secmem.c:250
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
@@ -259,7 +259,7 @@ msgstr ""
 "�NO USE NING�N DATO GENERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:118
+#: cipher/rndlinux.c:114
 #, c-format
 msgid ""
 "\n"
@@ -446,7 +446,10 @@ msgstr "algo m�s discreto"
 msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#. { oDryRun, "dry-run",   0, N_("do not make any changes") },
+#: g10/g10.c:235
+msgid "do not make any changes"
+msgstr ""
+
 #: g10/g10.c:236
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
@@ -636,122 +639,122 @@ msgstr "fichero de opciones `%s': %s\n"
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:796
+#: g10/g10.c:797
 #, 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:836 g10/g10.c:848
+#: g10/g10.c:837 g10/g10.c:849
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado no es v�lido\n"
 
-#: g10/g10.c:842 g10/g10.c:854
+#: g10/g10.c:843 g10/g10.c:855
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no es v�lido\n"
 
-#: g10/g10.c:857
+#: g10/g10.c:858
 #, 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:859
+#: g10/g10.c:860
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:861
+#: g10/g10.c:862
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:863
+#: g10/g10.c:864
 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:866
+#: g10/g10.c:867
 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:870
+#: g10/g10.c:871
 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:947
+#: g10/g10.c:948
 #, 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:953
+#: g10/g10.c:954
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:961
+#: g10/g10.c:962
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:969
+#: g10/g10.c:970
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:982
+#: g10/g10.c:983
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:995
+#: g10/g10.c:996
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:1009
+#: g10/g10.c:1010
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1022
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:1030
+#: g10/g10.c:1031
 msgid "--edit-key username [commands]"
 msgstr "--edit-key nombre_usuario"
 
-#: g10/g10.c:1046
+#: g10/g10.c:1047
 msgid "--delete-secret-key username"
 msgstr "--delete-secret-key nombre_usuario"
 
-#: g10/g10.c:1049
+#: g10/g10.c:1050
 msgid "--delete-key username"
 msgstr "--delete-key nombre_usuario"
 
-#: g10/encode.c:216 g10/g10.c:1072 g10/sign.c:311
+#: g10/encode.c:222 g10/g10.c:1073 g10/sign.c:311
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: g10/g10.c:1083
+#: g10/g10.c:1084
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [id_usuario] [anillo]"
 
-#: g10/g10.c:1144
+#: g10/g10.c:1145
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:1152
+#: g10/g10.c:1153
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1219
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n no v�lido `%s'\n"
 
-#: g10/g10.c:1297
+#: g10/g10.c:1298
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
-#: g10/g10.c:1301
+#: g10/g10.c:1302
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee el mensaje ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1304 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1305 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no puede abrirse `%s'\n"
@@ -829,7 +832,7 @@ msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 
-#: g10/pkclist.c:138
+#: g10/pkclist.c:136
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -838,7 +841,7 @@ msgstr ""
 "No hay confianza definida para el propietario %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:148
+#: g10/pkclist.c:146
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -860,28 +863,28 @@ msgstr ""
 " 4 = Me f�o completamente\n"
 " i = Mostrar m�s informaci�n\n"
 
-#: g10/pkclist.c:157
+#: g10/pkclist.c:155
 msgid " m = back to the main menu\n"
 msgstr " m = volver al men� principal\n"
 
-#: g10/pkclist.c:159
+#: g10/pkclist.c:157
 msgid " q = quit\n"
 msgstr " q = salir\n"
 
 #. a string with valid answers
-#: g10/pkclist.c:164
+#: g10/pkclist.c:162
 msgid "sSmMqQ"
 msgstr "iImMqQ"
 
-#: g10/pkclist.c:168
+#: g10/pkclist.c:166
 msgid "Your decision? "
 msgstr "Su decisi�n: "
 
-#: g10/pkclist.c:188
+#: g10/pkclist.c:186
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que llevan a una clave de confianza absoluta:\n"
 
-#: g10/pkclist.c:223
+#: g10/pkclist.c:221
 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"
@@ -891,7 +894,7 @@ msgstr ""
 "si es posible asignar algunos valores de confianza perdidos.\n"
 "\n"
 
-#: g10/pkclist.c:261
+#: g10/pkclist.c:260
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
@@ -899,13 +902,13 @@ msgstr ""
 "No se ha encontrado ninguna ruta con una de nuestras claves.\n"
 "\n"
 
-#: g10/pkclist.c:263
+#: g10/pkclist.c:262
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
 msgstr "No se ha encontrado ning�n certificado sin valor de confianza.\n"
 
-#: g10/pkclist.c:265
+#: g10/pkclist.c:264
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -913,31 +916,31 @@ msgstr ""
 "No se cambi� ning�n valor de confianza.\n"
 "\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:279
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "%08lX: �Esta clave ha sido retirada!\n"
 
-#: g10/pkclist.c:286 g10/pkclist.c:381
+#: g10/pkclist.c:285 g10/pkclist.c:397
 msgid "Use this key anyway? "
 msgstr "�Usar esta clave de todas formas? "
 
-#: g10/pkclist.c:308
+#: g10/pkclist.c:309
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: �Esta clave est� caducada!\n"
 
-#: g10/pkclist.c:314
+#: g10/pkclist.c:315
 #, 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:332
+#: g10/pkclist.c:333
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: �Esta clave NO es de confianza!\n"
 
-#: g10/pkclist.c:338
+#: g10/pkclist.c:339
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -947,15 +950,15 @@ msgstr ""
 "proprietario\n"
 "pero se acepta igualmente\n"
 
-#: g10/pkclist.c:344
+#: g10/pkclist.c:345
 msgid "This key probably belongs to the owner\n"
 msgstr "Esta clave probablemente pertenece a su proprietario\n"
 
-#: g10/pkclist.c:349
+#: g10/pkclist.c:350
 msgid "This key belongs to us\n"
 msgstr "Esta clave nos pertenece\n"
 
-#: g10/pkclist.c:376
+#: g10/pkclist.c:392
 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"
@@ -967,56 +970,56 @@ msgstr ""
 "\"s�\" a la siguiente pregunta.\n"
 "\n"
 
-#: g10/pkclist.c:385
+#: g10/pkclist.c:405
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATENCI�N: �Usando una clave no fiable!\n"
 
-#: g10/pkclist.c:421
+#: g10/pkclist.c:441
 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:422
+#: g10/pkclist.c:442
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "          Esto puede significar que la firma est� falsificada.\n"
 
-#: g10/pkclist.c:443
+#: g10/pkclist.c:463
 msgid "Note: This key has expired!\n"
 msgstr "Nota: �Esta clave est� caducada!\n"
 
-#: g10/pkclist.c:450
+#: g10/pkclist.c:470
 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:452
+#: g10/pkclist.c:472
 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:468
+#: g10/pkclist.c:488
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATENCI�N: �Esta clave NO es de confianza!\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:489
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         La firma es probablemente una FALSIFICACI�N.\n"
 
-#: g10/pkclist.c:476
+#: g10/pkclist.c:496
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: �Esta clave no est� certificada con suficientes firmas de confianza!\n"
 
-#: g10/pkclist.c:479
+#: g10/pkclist.c:499
 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:532 g10/pkclist.c:545 g10/pkclist.c:607 g10/pkclist.c:635
+#: g10/pkclist.c:552 g10/pkclist.c:565 g10/pkclist.c:628 g10/pkclist.c:656
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:574
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1024,20 +1027,20 @@ msgstr ""
 "No se ha especificado un ID de usuario (puede usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:579
 msgid "Enter the user ID: "
 msgstr "Introduzca el ID de usuario: "
 
-#: g10/pkclist.c:570
+#: g10/pkclist.c:590
 msgid "No such user ID.\n"
 msgstr "ID de usuario inexistente.\n"
 
-#: g10/pkclist.c:615
+#: g10/pkclist.c:636
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: error comprobando la clave: %s\n"
 
-#: g10/pkclist.c:641
+#: g10/pkclist.c:662
 msgid "no valid addressees\n"
 msgstr "no hay direcciones v�lidas\n"
 
@@ -1188,7 +1191,7 @@ msgstr "La clave caduca el %s\n"
 msgid "Is this correct (y/n)? "
 msgstr "�Es correcto (s/n)? "
 
-#: g10/keygen.c:582
+#: g10/keygen.c:583
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1206,23 +1209,23 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:593
+#: g10/keygen.c:594
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:597
+#: g10/keygen.c:598
 msgid "Invalid character in name\n"
 msgstr "Caracter no v�lido en el nombre\n"
 
-#: g10/keygen.c:599
+#: g10/keygen.c:600
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un n�mero\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:602
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:609
+#: g10/keygen.c:610
 msgid "Email address: "
 msgstr "Direcci�n de correo electr�nico: "
 
@@ -1238,7 +1241,12 @@ msgstr "Comentario: "
 msgid "Invalid character in comment\n"
 msgstr "Caracter no v�lido en el comentario\n"
 
-#: g10/keygen.c:655
+#: g10/keygen.c:657
+#, c-format
+msgid "You are using the `%s' character set.\n"
+msgstr ""
+
+#: g10/keygen.c:663
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1249,15 +1257,15 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:658
+#: g10/keygen.c:666
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:668
+#: g10/keygen.c:676
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (V)ale/(S)alir? "
 
-#: g10/keygen.c:720
+#: g10/keygen.c:728
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1265,11 +1273,11 @@ msgstr ""
 "Necesita una contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:389 g10/keygen.c:728
+#: g10/keyedit.c:389 g10/keygen.c:736
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "contrase�a repetida incorrecta, int�ntelo de nuevo.\n"
 
-#: g10/keygen.c:734
+#: g10/keygen.c:742
 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"
@@ -1281,7 +1289,7 @@ msgstr ""
 "la opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:755
+#: g10/keygen.c:763
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (work in another window, move the mouse, utilize the\n"
@@ -1294,33 +1302,33 @@ msgstr ""
 "generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
 "entrop�a.\n"
 
-#: g10/keygen.c:825
+#: g10/keygen.c:833
 msgid "Key generation can only be used in interactive mode\n"
 msgstr "La creaci�n de claves s�lo es posible en modo interactivo\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:841
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "El par de claves DSA tendr� 1024 bits.\n"
 
-#: g10/keygen.c:839
+#: g10/keygen.c:847
 msgid "Key generation cancelled.\n"
 msgstr "Creaci�n de claves cancelada.\n"
 
-#: g10/keygen.c:849
+#: g10/keygen.c:857
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "escribiendo certificado p�blico en `%s'\n"
 
-#: g10/keygen.c:850
+#: g10/keygen.c:858
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "escribiendo certificado privado en `%s'\n"
 
-#: g10/keygen.c:927
+#: g10/keygen.c:935
 msgid "public and secret key created and signed.\n"
 msgstr "Claves p�blica y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:929
+#: g10/keygen.c:937
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -1330,12 +1338,12 @@ msgstr ""
 "el comando \"--add-key\" para crear una clave secundaria con este "
 "prop�sito.\n"
 
-#: g10/keygen.c:943 g10/keygen.c:1042
+#: g10/keygen.c:951 g10/keygen.c:1050
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/keygen.c:987 g10/sig-check.c:172 g10/sign.c:52
+#: g10/keygen.c:995 g10/sig-check.c:209 g10/sign.c:52
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1343,7 +1351,7 @@ msgstr ""
 "clave p�blica creada %lu %s en el futuro (salto en el tiempo o problemas con "
 "el reloj)\n"
 
-#: g10/keygen.c:989 g10/sig-check.c:174 g10/sign.c:54
+#: g10/keygen.c:997 g10/sig-check.c:211 g10/sign.c:54
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1351,11 +1359,11 @@ msgstr ""
 "clave p�blica creada %lu %s en el futuro (salto en el tiempo o problemas con "
 "el reloj)\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:1028
 msgid "Really create? "
 msgstr "�Crear de verdad? "
 
-#: g10/encode.c:88 g10/openfile.c:86 g10/openfile.c:169 g10/tdbio.c:467
+#: g10/encode.c:88 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
 #: g10/tdbio.c:527
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1366,17 +1374,17 @@ msgstr "%s: no puede abrirse: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "error creando contrase�a: %s\n"
 
-#: g10/encode.c:155 g10/encode.c:269
+#: g10/encode.c:161 g10/encode.c:275
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: atenci�n: fichero vac�o\n"
 
-#: g10/encode.c:222
+#: g10/encode.c:228
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "leyendo desde `%s'\n"
 
-#: g10/encode.c:397
+#: g10/encode.c:403
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrado para: %s\n"
@@ -1408,12 +1416,12 @@ msgstr "demasiados registros en la cache pk - anulada\n"
 msgid "too many entries in unk cache - disabled\n"
 msgstr "demasiados registros en la cache unk - anulada\n"
 
-#: g10/getkey.c:1496 g10/getkey.c:1552
+#: g10/getkey.c:1502 g10/getkey.c:1558
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n"
 
-#: g10/import.c:116 g10/trustdb.c:1318
+#: g10/import.c:116 g10/trustdb.c:1228
 #, c-format
 msgid "can't open file: %s\n"
 msgstr "no puede abrirse el fichero: %s\n"
@@ -1423,12 +1431,12 @@ msgstr "no puede abrirse el fichero: %s\n"
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloque de tipo %d\n"
 
-#: g10/import.c:167 g10/trustdb.c:1635 g10/trustdb.c:1704
+#: g10/import.c:167 g10/trustdb.c:1564 g10/trustdb.c:1637
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "hasta ahora se han procesado %lu claves\n"
 
-#: g10/import.c:172 g10/trustdb.c:1394
+#: g10/import.c:172 g10/trustdb.c:1304
 #, c-format
 msgid "read error: %s\n"
 msgstr "error de lectura: %s\n"
@@ -1511,7 +1519,7 @@ msgstr "clave %08lX: clave p�blica no encontrada: %s\n"
 msgid "no default public keyring\n"
 msgstr "no hay anillo p�blico por defecto\n"
 
-#: g10/import.c:374 g10/openfile.c:113 g10/sign.c:215 g10/sign.c:601
+#: g10/import.c:374 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:498
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
@@ -2081,71 +2089,75 @@ msgstr "No hay firma correspondiente en anillo secreto\n"
 msgid "No user id with index %d\n"
 msgstr "No hay ning�n identificativo de usuario con el �ndice %d\n"
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1372
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No hay ninguna clave secundaria con el �ndice %d\n"
 
-#: g10/mainproc.c:199
+#: g10/mainproc.c:202
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados de la clave p�blica: DEK bueno\n"
 
-#: g10/mainproc.c:202
+#. 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 conetxt.  do_proc_packets can then use
+#. * this list to display some information
+#: g10/mainproc.c:209
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave p�blica fallido: %s\n"
 
-#: g10/mainproc.c:229
+#: g10/mainproc.c:236
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:232
+#: g10/mainproc.c:239
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:249
+#: g10/mainproc.c:256
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "nota: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:251
+#: g10/mainproc.c:258
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:831
+#: g10/mainproc.c:839
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificaci�n de la firma\n"
 
-#: g10/mainproc.c:837
+#: g10/mainproc.c:845
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Firma creada %.*s usando identificativo de clave %s %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:863 g10/mainproc.c:874
+#: g10/mainproc.c:871 g10/mainproc.c:882
 msgid "BAD signature from \""
 msgstr "Firma INCORRECTA de \""
 
-#: g10/mainproc.c:864 g10/mainproc.c:875
+#: g10/mainproc.c:872 g10/mainproc.c:883
 msgid "Good signature from \""
 msgstr "Firma correcta de \""
 
-#: g10/mainproc.c:866
+#: g10/mainproc.c:874
 #, fuzzy
 msgid "                aka \""
 msgstr "                       importadas: %lu"
 
-#: g10/mainproc.c:908
+#: g10/mainproc.c:916
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:981
+#: g10/mainproc.c:989
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:986
+#: g10/mainproc.c:994
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z no v�lido detectado en proc_tree()\n"
 
@@ -2262,29 +2274,29 @@ msgstr "Contrase�a incorrecta, int�ntelo de nuevo...\n"
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "Aviso: detectada clave d�bil - por favor cambie la contrase�a.\n"
 
-#: g10/sig-check.c:155
+#: g10/sig-check.c:192
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "�esto es una clave ElGamal generada por PGP que NO es segura para las "
 "firmas!\n"
 
-#: g10/sig-check.c:163
+#: g10/sig-check.c:200
 #, fuzzy, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "lid %lu: identificativo de usuario sin firma\n"
 
-#: g10/sig-check.c:164
+#: g10/sig-check.c:201
 #, fuzzy, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "lid %lu: identificativo de usuario sin firma\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:217
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "atenci�n: clave de la firma caducada el %s\n"
 
-#: g10/sig-check.c:237
+#: g10/sig-check.c:274
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "asumiendo firma mala debido a un bit cr�tico desconocido\n"
 
@@ -2293,7 +2305,7 @@ msgstr "asumiendo firma mala debido a un bit cr�tico desconocido\n"
 msgid "%s signature from: %s\n"
 msgstr "firma %s de %s\n"
 
-#: g10/sign.c:210 g10/sign.c:596
+#: g10/sign.c:210 g10/sign.c:493
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "no puede crearse `%s': %s\n"
@@ -2307,11 +2319,16 @@ msgstr "firmando:"
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "atenci�n: '%s' es un fichero vac�o\n"
 
-#: g10/textfilter.c:199
+#: g10/textfilter.c:122
 #, fuzzy, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "armadura inv�lida: l�nea m�s larga de %d caracteres\n"
 
+#: g10/textfilter.c:189
+#, fuzzy, c-format
+msgid "input line longer than %d characters\n"
+msgstr "armadura inv�lida: l�nea m�s larga de %d caracteres\n"
+
 #: g10/tdbio.c:117 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
@@ -2332,12 +2349,12 @@ msgstr "transacci�n en la base de datos de confianza demasiado grande\n"
 msgid "%s: can't access: %s\n"
 msgstr "%s: no puede abrirse: %s\n"
 
-#: g10/ringedit.c:294 g10/tdbio.c:444
+#: g10/ringedit.c:296 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: no puede crearse el directorio: %s\n"
 
-#: g10/ringedit.c:300 g10/tdbio.c:447
+#: g10/ringedit.c:302 g10/tdbio.c:447
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: se ha creado el directorio\n"
@@ -2347,7 +2364,7 @@ msgstr "%s: se ha creado el directorio\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: el directorio no existe\n"
 
-#: g10/openfile.c:109 g10/openfile.c:176 g10/ringedit.c:1310 g10/tdbio.c:457
+#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1325 g10/tdbio.c:457
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: no puede crearse: %s\n"
@@ -2443,166 +2460,166 @@ msgstr "%s: fallo en poner a cero un registro: %s\n"
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: fallo al a�adir un registro: %s\n"
 
-#: g10/trustdb.c:144
+#: g10/trustdb.c:165
 msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
 msgstr ""
 "La base de datos de confianza est� da�ada. Por favor, ejecute\n"
 "\"gpgm --fix-trust-db\".\n"
 
-#: g10/trustdb.c:157
+#: g10/trustdb.c:178
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registro de confianza %lu, petici�n tipo %d: fallo lectura: %s\n"
 
-#: g10/trustdb.c:172
+#: g10/trustdb.c:193
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registro de confianza %lu, tipo %d: fallo escritura: %s\n"
 
-#: g10/trustdb.c:186
+#: g10/trustdb.c:207
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "registro de confianza %lu: fallo al borrar: %s\n"
 
-#: g10/trustdb.c:200
+#: g10/trustdb.c:221
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallo sincronizaci�n: %s\n"
 
-#: g10/trustdb.c:329
+#: g10/trustdb.c:351
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "error lectura registro de directorio del LID %lu: %s\n"
 
-#: g10/trustdb.c:336
+#: g10/trustdb.c:358
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: esperaba registro directorio, encontrado tipo %d\n"
 
-#: g10/trustdb.c:341
+#: g10/trustdb.c:363
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "no hay clave primaria para el LID %lu\n"
 
-#: g10/trustdb.c:346
+#: g10/trustdb.c:368
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "error lectura clave primaria para el LID %lu: %s\n"
 
-#: g10/trustdb.c:422
+#: g10/trustdb.c:445
 #, c-format
 msgid "chained sigrec %lu has a wrong owner\n"
 msgstr "registro de firma encadenado %lu tiene el propietario equivocado\n"
 
-#: g10/trustdb.c:465
+#: g10/trustdb.c:488
 #, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "'%s' no es un identificativo largo de clave v�lido\n"
 
-#: g10/trustdb.c:500
+#: g10/trustdb.c:523
 #, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr "clave %08lX: clave de confianza sin clave p�blica - ignorada\n"
 
-#: g10/trustdb.c:509 g10/trustdb.c:567
+#: g10/trustdb.c:532 g10/trustdb.c:590
 #, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "clave %08lX: imposible incluirla en la base de datos de confianza\n"
 
-#: g10/trustdb.c:514 g10/trustdb.c:573
+#: g10/trustdb.c:537 g10/trustdb.c:596
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "clave %08lX: petici�n de registro fallida\n"
 
-#: g10/trustdb.c:519 g10/trustdb.c:582
+#: g10/trustdb.c:542 g10/trustdb.c:605
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "clave %08lX: ya est� en la tabla de confianza\n"
 
-#: g10/trustdb.c:522 g10/trustdb.c:585
+#: g10/trustdb.c:545 g10/trustdb.c:608
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "clave %08lX: aceptada como clave de confianza.\n"
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:561
 #, c-format
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "NOTA: la clave secreta %08lX NO est� protegida.\n"
 
-#: g10/trustdb.c:550
+#: g10/trustdb.c:573
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "clave %08lX: clave secreta sin clave p�blica - ignorada\n"
 
-#: g10/trustdb.c:557
+#: g10/trustdb.c:580
 #, c-format
 msgid "key %08lX: secret and public key don't match\n"
 msgstr "clave %08lX: las claves p�blica y secreta no se corresponden\n"
 
-#: g10/trustdb.c:593
+#: g10/trustdb.c:616
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enum_secret_keys fallido: %s\n"
 
-#: g10/trustdb.c:776
+#: g10/trustdb.c:770
 #, c-format
 msgid "lid %lu: read dir record failed: %s\n"
 msgstr "lid %lu: lectura registro de directorio fallida: %s\n"
 
-#: g10/trustdb.c:785
+#: g10/trustdb.c:779
 #, c-format
 msgid "lid %lu: read key record failed: %s\n"
 msgstr "lid %lu: lectura registro de clave fallida: %s\n"
 
-#: g10/trustdb.c:795
+#: g10/trustdb.c:789
 #, c-format
 msgid "lid %lu: read uid record failed: %s\n"
 msgstr "lid %lu: lectura registro identificativo fallida: %s\n"
 
-#: g10/trustdb.c:804
+#: g10/trustdb.c:798
 #, c-format
 msgid "lid %lu: read pref record failed: %s\n"
 msgstr "lid %lu: lectura registro preferencias fallida: %s\n"
 
-#: g10/trustdb.c:814
+#: g10/trustdb.c:808
 #, c-format
 msgid "lid %lu: read sig record failed: %s\n"
 msgstr "lid %lu: lectura registro firma fallida: %s\n"
 
-#: g10/trustdb.c:1151
+#: g10/trustdb.c:1037
 msgid "Ooops, no keys\n"
 msgstr "Oh oh, no hay claves\n"
 
-#: g10/trustdb.c:1155
+#: g10/trustdb.c:1041
 msgid "Ooops, no user ids\n"
 msgstr "Oh oh, no hay identificativos de usuario\n"
 
-#: g10/trustdb.c:1226 g10/trustdb.c:1244
+#: g10/trustdb.c:1134 g10/trustdb.c:1152
 #, c-format
 msgid "user '%s' read problem: %s\n"
 msgstr "problema de lectura usuario '%s': %s\n"
 
-#: g10/trustdb.c:1229 g10/trustdb.c:1247
+#: g10/trustdb.c:1137 g10/trustdb.c:1155
 #, c-format
 msgid "user '%s' list problem: %s\n"
 msgstr "problema lista usuario '%s': %s\n"
 
-#: g10/trustdb.c:1237 g10/trustdb.c:1485
+#: g10/trustdb.c:1145 g10/trustdb.c:1447
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "usuario '%s' no encontrado: %s\n"
 
-#: g10/trustdb.c:1239 g10/trustdb.c:1487
+#: g10/trustdb.c:1147 g10/trustdb.c:1449
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problema buscando '%s' en la tabla de confianza: %s\n"
 
-#: g10/trustdb.c:1242
+#: g10/trustdb.c:1150
 #, c-format
 msgid "user '%s' not in trustdb\n"
 msgstr "usuario '%s' no est� en la tabla de confianza\n"
 
-#: g10/trustdb.c:1277
+#: g10/trustdb.c:1186
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -2611,205 +2628,205 @@ msgstr ""
 "# Lista de valores de confianza, creada el %s\n"
 "# (Puede usar \"gpgm --import-ownertrust\" para restablecerlos)\n"
 
-#: g10/trustdb.c:1283
+#: g10/trustdb.c:1192
 msgid "directory record w/o primary key\n"
 msgstr "registro de directorio sin clave primaria\n"
 
-#: g10/trustdb.c:1290
+#: g10/trustdb.c:1199
 #, c-format
 msgid "error reading key record: %s\n"
 msgstr "error lectura registro de clave: %s\n"
 
-#: g10/trustdb.c:1330
+#: g10/trustdb.c:1240
 msgid "line too long\n"
 msgstr "linea demasiado larga\n"
 
-#: g10/trustdb.c:1338
+#: g10/trustdb.c:1248
 msgid "error: missing colon\n"
 msgstr "error: falta ':'\n"
 
-#: g10/trustdb.c:1343
+#: g10/trustdb.c:1253
 msgid "error: invalid fingerprint\n"
 msgstr "error: huella dactilar no v�lida\n"
 
-#: g10/trustdb.c:1347
+#: g10/trustdb.c:1257
 msgid "error: no ownertrust value\n"
 msgstr "error: no hay valor de confianza del propietario\n"
 
-#: g10/trustdb.c:1372
+#: g10/trustdb.c:1282
 msgid "key not in trustdb, searching ring.\n"
 msgstr "la clave no est� en tabla de confianza, buscando en el anillo.\n"
 
-#: g10/trustdb.c:1375
+#: g10/trustdb.c:1285
 #, c-format
 msgid "key not in ring: %s\n"
 msgstr "la clave no est� en el anillo: %s\n"
 
-#: g10/trustdb.c:1379
+#: g10/trustdb.c:1289
 msgid "Oops: key is now in trustdb???\n"
 msgstr "Oh oh: la clave ahora est� en la tabla de confianza???\n"
 
 #. update the ownertrust
-#: g10/trustdb.c:1384
+#: g10/trustdb.c:1294
 #, c-format
 msgid "insert trust record failed: %s\n"
 msgstr "inserci�n del registro de confianza fallida: %s\n"
 
 #. error
-#: g10/trustdb.c:1390
+#: g10/trustdb.c:1300
 #, c-format
 msgid "error finding dir record: %s\n"
 msgstr "error buscando registro de directorio: %s\n"
 
-#: g10/trustdb.c:1490
+#: g10/trustdb.c:1452
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "usuario '%s' no est� en la tabla de confianza - insertando\n"
 
-#: g10/trustdb.c:1493
+#: g10/trustdb.c:1455
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "fallo al poner '%s' en la tabla de confianza: %s\n"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1494
 #, c-format
 msgid "%s: keyblock read problem: %s\n"
 msgstr "%s: problema lectura del bloque de clave: %s\n"
 
-#: g10/trustdb.c:1579
+#: g10/trustdb.c:1508
 #, c-format
 msgid "%s: update failed: %s\n"
 msgstr "%s: actualizaci�n fallida: %s\n"
 
-#: g10/trustdb.c:1582
+#: g10/trustdb.c:1511
 #, c-format
 msgid "%s: updated\n"
 msgstr "%s: actualizada\n"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1513
 #, c-format
 msgid "%s: okay\n"
 msgstr "%s: bien\n"
 
-#: g10/trustdb.c:1599
+#: g10/trustdb.c:1528
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: registro de directiorio sin clave - ignorado\n"
 
-#: g10/trustdb.c:1612
+#: g10/trustdb.c:1541
 #, c-format
 msgid "lid %lu: keyblock not found: %s\n"
 msgstr "lid %lu: bloque de clave no encontrado: %s\n"
 
-#: g10/trustdb.c:1621 g10/trustdb.c:1690
+#: g10/trustdb.c:1550 g10/trustdb.c:1623
 #, c-format
 msgid "lid %lu: update failed: %s\n"
 msgstr "lid %lu: actualizaci�n fallida: %s\n"
 
-#: g10/trustdb.c:1627 g10/trustdb.c:1696
+#: g10/trustdb.c:1556 g10/trustdb.c:1629
 #, c-format
 msgid "lid %lu: updated\n"
 msgstr "lid %lu: actualizado\n"
 
-#: g10/trustdb.c:1631 g10/trustdb.c:1700
+#: g10/trustdb.c:1560 g10/trustdb.c:1633
 #, c-format
 msgid "lid %lu: okay\n"
 msgstr "lid %lu: bien\n"
 
-#: g10/trustdb.c:1638 g10/trustdb.c:1706
+#: g10/trustdb.c:1567 g10/trustdb.c:1639
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "se han procesado %lu claves\n"
 
-#: g10/trustdb.c:1640
+#: g10/trustdb.c:1569
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu claves ignoradas\n"
 
-#: g10/trustdb.c:1642 g10/trustdb.c:1708
+#: g10/trustdb.c:1571 g10/trustdb.c:1641
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu claves con errores\n"
 
-#: g10/trustdb.c:1644 g10/trustdb.c:1710
+#: g10/trustdb.c:1573 g10/trustdb.c:1643
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu claves actualizadas\n"
 
-#: g10/trustdb.c:1674
+#: g10/trustdb.c:1607
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: inserci�n fallida: %s\n"
 
-#: g10/trustdb.c:1679
+#: g10/trustdb.c:1612
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: inserci�n fallida: %s\n"
 
-#: g10/trustdb.c:1685
+#: g10/trustdb.c:1618
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: insertada\n"
 
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1645
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu claves insertadas\n"
 
-#: g10/trustdb.c:1715
+#: g10/trustdb.c:1648
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumeraci�n bloques de clave fallido: %s\n"
 
-#: g10/trustdb.c:1760
+#: g10/trustdb.c:1694
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: b�squeda registro directorio fallida: %s\n"
 
-#: g10/trustdb.c:1767
+#: g10/trustdb.c:1701
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "clave %08lX: inserci�n del registro de confianza fallida: %s\n"
 
-#: g10/trustdb.c:1771
+#: g10/trustdb.c:1705
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "clave %08lX.%lu: incluida en la base de datos de confianza\n"
 
-#: g10/trustdb.c:1779
+#: g10/trustdb.c:1713
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "clave %08lX.%lu: creada en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/trustdb.c:1786
+#: g10/trustdb.c:1720
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "clave %08lX.%lu: caducada el %s\n"
 
-#: g10/trustdb.c:1794
+#: g10/trustdb.c:1728
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "clave %08lX.%lu: comprobaci�n de confianza fallida: %s\n"
 
-#: g10/trustdb.c:2003 g10/trustdb.c:2032 g10/trustdb.c:2771
+#: g10/trustdb.c:1951 g10/trustdb.c:1981 g10/trustdb.c:2734
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "ATENC�ON: todav�a no puedo tratar registros de preferencias largos\n"
 
-#: g10/trustdb.c:2054
+#: g10/trustdb.c:2003
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record fallida: %s\n"
 
-#: g10/trustdb.c:2117
+#: g10/trustdb.c:2071
 #, c-format
 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"
 "de b�squeda de %lu pero est� marcado como comprobado\n"
 
-#: g10/trustdb.c:2121
+#: g10/trustdb.c:2075
 #, c-format
 msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n"
 msgstr ""
@@ -2817,187 +2834,187 @@ msgstr ""
 "de b�squeda de %lu pero no est� marcado\n"
 
 #. we need the dir record
-#: g10/trustdb.c:2128
+#: g10/trustdb.c:2082
 #, c-format
 msgid "sig rec %lu[%d] in hintlist of %lu does not point to a dir record\n"
 msgstr ""
 "El registro de firma %lu[%d] en la lista de b�squeda de %lu\n"
 "no apunta a un registro de directorio\n"
 
-#: g10/trustdb.c:2134
+#: g10/trustdb.c:2088
 #, c-format
 msgid "lid %lu: no primary key\n"
 msgstr "lid %lu: ninguna clave primaria\n"
 
-#: g10/trustdb.c:2167
+#: g10/trustdb.c:2121
 #, c-format
 msgid "lid %lu: user id not found in keyblock\n"
 msgstr ""
 "lid %lu: no se ha encontrado identificativo de usuario\n"
 "en el bloque de clave\n"
 
-#: g10/trustdb.c:2171
+#: g10/trustdb.c:2125
 #, c-format
 msgid "lid %lu: user id without signature\n"
 msgstr "lid %lu: identificativo de usuario sin firma\n"
 
-#: g10/trustdb.c:2178
+#: g10/trustdb.c:2132
 #, c-format
 msgid "lid %lu: self-signature in hintlist\n"
 msgstr "lid %lu: autofirma en lista de b�squeda\n"
 
-#: g10/trustdb.c:2189 g10/trustdb.c:2910 g10/trustdb.c:2994
+#: g10/trustdb.c:2143 g10/trustdb.c:2879 g10/trustdb.c:2962
 msgid "Valid certificate revocation"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: g10/trustdb.c:2190 g10/trustdb.c:2911 g10/trustdb.c:2995
+#: g10/trustdb.c:2144 g10/trustdb.c:2880 g10/trustdb.c:2963
 msgid "Good certificate"
 msgstr "Certificado bueno"
 
-#: g10/trustdb.c:2199
+#: g10/trustdb.c:2153
 msgid "very strange: no public key\n"
 msgstr "muy raro: no hay clave p�blica\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2201
 #, c-format
 msgid "hintlist %lu[%d] of %lu does not point to a dir record\n"
 msgstr ""
 "la lista de b�squeda %lu[%d] de %lu no apunta a\n"
 "un registro de directorio\n"
 
-#: g10/trustdb.c:2253
+#: g10/trustdb.c:2207
 #, c-format
 msgid "lid %lu does not have a key\n"
 msgstr "lid %lu no dispone de clave\n"
 
-#: g10/trustdb.c:2263
+#: g10/trustdb.c:2217
 #, c-format
 msgid "lid %lu: can't get keyblock: %s\n"
 msgstr "lid %lu: no puedo obtener el bloque de clave: %s\n"
 
-#: g10/trustdb.c:2320 g10/trustdb.c:3245
+#: g10/trustdb.c:2274 g10/trustdb.c:3227
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir fallida: %s\n"
 
-#: g10/trustdb.c:2473
+#: g10/trustdb.c:2427
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "clave %08lX.%lu: buena uni�n de sub-clave\n"
 
-#: g10/trustdb.c:2479 g10/trustdb.c:2521
+#: g10/trustdb.c:2433 g10/trustdb.c:2475
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "clave %08lX.%lu: uni�n de sub-clave no v�lida\n"
 
-#: g10/trustdb.c:2494
+#: g10/trustdb.c:2448
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "clave %08lX.%lu: revocaci�n de clave v�lida\n"
 
-#: g10/trustdb.c:2500
+#: g10/trustdb.c:2454
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "clave %08lX.%lu: revocaci�n de clave no v�lida: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2469
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "clave %08lX.%lu: revocaci�n de sub-clave v�lida\n"
 
-#: g10/trustdb.c:2615
+#: g10/trustdb.c:2573
 msgid "Good self-signature"
 msgstr "autofirma buena"
 
-#: g10/trustdb.c:2626
+#: g10/trustdb.c:2584
 msgid "Invalid self-signature"
 msgstr "autofirma no v�lida"
 
-#: g10/trustdb.c:2636
+#: g10/trustdb.c:2594
 msgid "Valid user ID revocation skipped due to a newer self signature\n"
 msgstr ""
 "Revocaci�n v�lida de identificativo de usuario ignorada debido auna "
 "autofirma m�s reciente\n"
 
-#: g10/trustdb.c:2643
+#: g10/trustdb.c:2601
 msgid "Valid user ID revocation\n"
 msgstr "Revocaci�n identificativo de usuario v�lida.\n"
 
-#: g10/trustdb.c:2650
+#: g10/trustdb.c:2608
 #, fuzzy
 msgid "Invalid user ID revocation"
 msgstr "Revocaci�n identificativo de usuario no v�lida.\n"
 
-#: g10/trustdb.c:2734
+#: g10/trustdb.c:2697
 msgid "Too many preferences"
 msgstr "demasiadas preferencias"
 
-#: g10/trustdb.c:2748
+#: g10/trustdb.c:2711
 msgid "Too many preference items"
 msgstr "demasiados items de preferencias"
 
-#: g10/trustdb.c:2888
+#: g10/trustdb.c:2857
 #, fuzzy
 msgid "duplicated certificate - deleted"
 msgstr "Certificado duplicado - eliminado"
 
-#: g10/trustdb.c:2922
+#: g10/trustdb.c:2891
 msgid "Hmmm, public key lost?"
 msgstr "Oh oh, �se ha perdido la clave p�blica?"
 
-#: g10/trustdb.c:2932 g10/trustdb.c:3015
+#: g10/trustdb.c:2900 g10/trustdb.c:2983
 msgid "Invalid certificate revocation"
 msgstr "Certificado de revocaci�n incorrecto"
 
-#: g10/trustdb.c:2933 g10/trustdb.c:3016
+#: g10/trustdb.c:2901 g10/trustdb.c:2984
 msgid "Invalid certificate"
 msgstr "Certificado incorrecto"
 
-#: g10/trustdb.c:2948
+#: g10/trustdb.c:2916
 #, c-format
 msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n"
 msgstr ""
 
-#: g10/trustdb.c:2962
+#: g10/trustdb.c:2930
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "registro de firma %lu[%d] apunta al registro equivocado.\n"
 
 #. that should never happen
-#: g10/trustdb.c:3215
+#: g10/trustdb.c:3190
 #, c-format
 msgid "insert_trust_record: keyblock not found: %s\n"
 msgstr "insert_trust_record: bloque de clave no encontrado: %s\n"
 
-#: g10/trustdb.c:3233
+#: g10/trustdb.c:3215
 msgid "did not use primary key for insert_trust_record()\n"
 msgstr "no se us� clave primaria para insert_trust_record()\n"
 
-#: g10/ringedit.c:314
+#: g10/ringedit.c:316
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: no se puede crear el anillo: %s\n"
 
-#: g10/ringedit.c:320 g10/ringedit.c:1315
+#: g10/ringedit.c:322 g10/ringedit.c:1330
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anillo creado\n"
 
-#: g10/ringedit.c:1492
+#: g10/ringedit.c:1507
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATENCI�N: existen 2 ficheros con informaci�n confidencial.\n"
 
-#: g10/ringedit.c:1493
+#: g10/ringedit.c:1508
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s es el que no se ha modificado\n"
 
-#: g10/ringedit.c:1494
+#: g10/ringedit.c:1509
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s es el nuevo\n"
 
-#: g10/ringedit.c:1495
+#: g10/ringedit.c:1510
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor arregle este posible fallo de seguridad\n"
 
@@ -3033,12 +3050,12 @@ msgstr "�Sobreescribir (s/N)? "
 msgid "writing to stdout\n"
 msgstr "escribiendo en stdout\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "asumiendo que hay datos firmados en `%s'\n"
 
-#: g10/openfile.c:192
+#: g10/openfile.c:197
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: se ha creado un nuevo fichero de opciones\n"
diff --git a/po/fr.po b/po/fr.po
index 85fc12633..142bf0d9b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 0.9.0a\n"
-"POT-Creation-Date: 1999-02-19 15:31+0100\n"
+"POT-Creation-Date: 1999-03-08 19:50+0100\n"
 "PO-Revision-Date: 1999-01-09 00:25+01:00\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -13,15 +13,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: util/secmem.c:77
+#: util/secmem.c:76
 msgid "Warning: using insecure memory!\n"
 msgstr "Attention : utilisation de la m�moire non s�re !\n"
 
-#: util/secmem.c:250
+#: util/secmem.c:249
 msgid "operation is not possible without initialized secure memory\n"
 msgstr ""
 
-#: util/secmem.c:251
+#: util/secmem.c:250
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
@@ -254,7 +254,7 @@ msgstr ""
 "N'UTILISEZ PAS LES DONN�ES G�N�R�ES PAR CE PROGRAMME!!\n"
 "\n"
 
-#: cipher/rndlinux.c:118
+#: cipher/rndlinux.c:114
 #, c-format
 msgid ""
 "\n"
@@ -442,7 +442,10 @@ msgstr "devenir beaucoup plus silencieux"
 msgid "force v3 signatures"
 msgstr "forcer les signatures en v3"
 
-#. { oDryRun, "dry-run",   0, N_("do not make any changes") },
+#: g10/g10.c:235
+msgid "do not make any changes"
+msgstr ""
+
 #: g10/g10.c:236
 msgid "batch mode: never ask"
 msgstr "mode automatique : ne jamais rien demander"
@@ -630,122 +633,122 @@ msgstr "fichier d'options `%s' : %s\n"
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:796
+#: g10/g10.c:797
 #, 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:836 g10/g10.c:848
+#: g10/g10.c:837 g10/g10.c:849
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/g10.c:842 g10/g10.c:854
+#: g10/g10.c:843 g10/g10.c:855
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/g10.c:857
+#: g10/g10.c:858
 #, 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:859
+#: g10/g10.c:860
 msgid "completes-needed must be greater than 0\n"
 msgstr "� completes-needed � doit �tre sup�rieur � 0\n"
 
-#: g10/g10.c:861
+#: g10/g10.c:862
 msgid "marginals-needed must be greater than 1\n"
 msgstr "� marginals-needed � doit �tre sup�rieur � 1\n"
 
-#: g10/g10.c:863
+#: g10/g10.c:864
 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:866
+#: g10/g10.c:867
 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:870
+#: g10/g10.c:871
 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:947
+#: g10/g10.c:948
 #, 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:953
+#: g10/g10.c:954
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:961
+#: g10/g10.c:962
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:969
+#: g10/g10.c:970
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:982
+#: g10/g10.c:983
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:995
+#: g10/g10.c:996
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:1009
+#: g10/g10.c:1010
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1022
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:1030
+#: g10/g10.c:1031
 msgid "--edit-key username [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/g10.c:1046
+#: g10/g10.c:1047
 msgid "--delete-secret-key username"
 msgstr "--delete-secret-key utilisateur"
 
-#: g10/g10.c:1049
+#: g10/g10.c:1050
 msgid "--delete-key username"
 msgstr "--delete-key utilisateur"
 
-#: g10/encode.c:216 g10/g10.c:1072 g10/sign.c:311
+#: g10/encode.c:222 g10/g10.c:1073 g10/sign.c:311
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "ne peut ouvrir %s: %s\n"
 
-#: g10/g10.c:1083
+#: g10/g10.c:1084
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/g10.c:1144
+#: g10/g10.c:1145
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "suppression d'armure non r�ussie : %s\n"
 
-#: g10/g10.c:1152
+#: g10/g10.c:1153
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "construction d'armure non r�ussie : %s \n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1219
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:1297
+#: g10/g10.c:1298
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:1301
+#: g10/g10.c:1302
 msgid "Go ahead and type your message ...\n"
 msgstr "Continuez et tapez votre message...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1304 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1305 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne peut ouvrir `%s'\n"
@@ -823,7 +826,7 @@ msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 
-#: g10/pkclist.c:138
+#: g10/pkclist.c:136
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -832,7 +835,7 @@ msgstr ""
 "Pas de confiance d�finie pour %lu :\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:148
+#: g10/pkclist.c:146
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -854,28 +857,28 @@ msgstr ""
 " 4 = je le crois totalement\n"
 " s = montrez moi plus d'informations\n"
 
-#: g10/pkclist.c:157
+#: g10/pkclist.c:155
 msgid " m = back to the main menu\n"
 msgstr " m = retour au menu principal\n"
 
-#: g10/pkclist.c:159
+#: g10/pkclist.c:157
 msgid " q = quit\n"
 msgstr " q = quitter\n"
 
 #. a string with valid answers
-#: g10/pkclist.c:164
+#: g10/pkclist.c:162
 msgid "sSmMqQ"
 msgstr "sSmMqQ"
 
-#: g10/pkclist.c:168
+#: g10/pkclist.c:166
 msgid "Your decision? "
 msgstr "Votre d�cision ? "
 
-#: g10/pkclist.c:188
+#: g10/pkclist.c:186
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificats conduisant vers une cl� � confiance ultime :\n"
 
-#: g10/pkclist.c:223
+#: g10/pkclist.c:221
 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"
@@ -884,7 +887,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:261
+#: g10/pkclist.c:260
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
@@ -892,7 +895,7 @@ msgstr ""
 "Aucun chemin menant vers une de nos cl�s n'a �t� trouv�.\n"
 "\n"
 
-#: g10/pkclist.c:263
+#: g10/pkclist.c:262
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
@@ -900,7 +903,7 @@ msgstr ""
 "Aucun certificat � confiance ind�finie n'a �t� trouv�.\n"
 "\n"
 
-#: g10/pkclist.c:265
+#: g10/pkclist.c:264
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -908,31 +911,31 @@ msgstr ""
 "Pas d'indice de confiance chang�.\n"
 "\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:279
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "cl� %08lX : la cl� a �t� r�voqu�e !\n"
 
-#: g10/pkclist.c:286 g10/pkclist.c:381
+#: g10/pkclist.c:285 g10/pkclist.c:397
 msgid "Use this key anyway? "
 msgstr "Utiliser cette cl� quand-m�me ? "
 
-#: g10/pkclist.c:308
+#: g10/pkclist.c:309
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX : la cl� a expir�\n"
 
-#: g10/pkclist.c:314
+#: g10/pkclist.c:315
 #, 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:332
+#: g10/pkclist.c:333
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX : Nous ne faisons PAS confiance � cette cl�\n"
 
-#: g10/pkclist.c:338
+#: g10/pkclist.c:339
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -942,15 +945,15 @@ msgstr ""
 "propri�taire\n"
 "mais elle est quand m�me accept�e\n"
 
-#: g10/pkclist.c:344
+#: g10/pkclist.c:345
 msgid "This key probably belongs to the owner\n"
 msgstr "Cette cl� appartient probablement � son propri�taire\n"
 
-#: g10/pkclist.c:349
+#: g10/pkclist.c:350
 msgid "This key belongs to us\n"
 msgstr "Cette cl� nous appartient\n"
 
-#: g10/pkclist.c:376
+#: g10/pkclist.c:392
 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"
@@ -962,58 +965,58 @@ msgstr ""
 "oui � la prochaine question\n"
 "\n"
 
-#: g10/pkclist.c:385
+#: g10/pkclist.c:405
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENTION : Utilisation d'une cl� sans confiance !\n"
 
-#: g10/pkclist.c:421
+#: g10/pkclist.c:441
 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:422
+#: g10/pkclist.c:442
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Cela pourrait signifier que la signature est fausse.\n"
 
-#: g10/pkclist.c:443
+#: g10/pkclist.c:463
 msgid "Note: This key has expired!\n"
 msgstr "Note : Cette cl� a expir� !\n"
 
-#: g10/pkclist.c:450
+#: g10/pkclist.c:470
 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:452
+#: g10/pkclist.c:472
 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:468
+#: g10/pkclist.c:488
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENTION : Nous ne faisons PAS confiance � cette cl� !\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:489
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         La signature est certainement FAUSSE.\n"
 
-#: g10/pkclist.c:476
+#: g10/pkclist.c:496
 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:479
+#: g10/pkclist.c:499
 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:532 g10/pkclist.c:545 g10/pkclist.c:607 g10/pkclist.c:635
+#: g10/pkclist.c:552 g10/pkclist.c:565 g10/pkclist.c:628 g10/pkclist.c:656
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s : ignor� : %s\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:574
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1022,20 +1025,20 @@ msgstr ""
 "\"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:579
 msgid "Enter the user ID: "
 msgstr "Entrez le nom d'utilisateur : "
 
-#: g10/pkclist.c:570
+#: g10/pkclist.c:590
 msgid "No such user ID.\n"
 msgstr "Pas de tel utilisateur.\n"
 
-#: g10/pkclist.c:615
+#: g10/pkclist.c:636
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s : erreur pendant la v�rification de la cl� : %s\n"
 
-#: g10/pkclist.c:641
+#: g10/pkclist.c:662
 msgid "no valid addressees\n"
 msgstr "pas de destinataire valide\n"
 
@@ -1187,7 +1190,7 @@ msgstr "La cl� expire le %s\n"
 msgid "Is this correct (y/n)? "
 msgstr "Est-ce correct (o/n) ? "
 
-#: g10/keygen.c:582
+#: g10/keygen.c:583
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1203,24 +1206,24 @@ msgstr ""
 "   � Heinrich Heine (Der Dichter) <[email protected]> �\n"
 "\n"
 
-#: g10/keygen.c:593
+#: g10/keygen.c:594
 msgid "Real name: "
 msgstr "Nom r�el : "
 
-#: g10/keygen.c:597
+#: g10/keygen.c:598
 msgid "Invalid character in name\n"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: g10/keygen.c:599
+#: g10/keygen.c:600
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer avec un chiffre\n"
 
 # ??? c'est de la discrimination...
-#: g10/keygen.c:601
+#: g10/keygen.c:602
 msgid "Name must be at least 5 characters long\n"
 msgstr "Le nom doit faire au moins 5 caract�res de long\n"
 
-#: g10/keygen.c:609
+#: g10/keygen.c:610
 msgid "Email address: "
 msgstr "Adresse e-mail : "
 
@@ -1236,7 +1239,12 @@ msgstr "Commentaire : "
 msgid "Invalid character in comment\n"
 msgstr "Caract�re invalide dans le commentaire\n"
 
-#: g10/keygen.c:655
+#: g10/keygen.c:657
+#, c-format
+msgid "You are using the `%s' character set.\n"
+msgstr ""
+
+#: g10/keygen.c:663
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1247,15 +1255,15 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:658
+#: g10/keygen.c:666
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:668
+#: g10/keygen.c:676
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (O)K/(Q)uitter? "
 
-#: g10/keygen.c:720
+#: g10/keygen.c:728
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1263,11 +1271,11 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour prot�ger votre cl� secr�te.\n"
 "\n"
 
-#: g10/keyedit.c:389 g10/keygen.c:728
+#: g10/keyedit.c:389 g10/keygen.c:736
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "le mot de passe n'a pas �t� identiquement r�p�t� ; recommencez.\n"
 
-#: g10/keygen.c:734
+#: g10/keygen.c:742
 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"
@@ -1279,7 +1287,7 @@ msgstr ""
 "le d�sirez, en utilisant ce programme avec l'option � --edit-key �.\n"
 "\n"
 
-#: g10/keygen.c:755
+#: g10/keygen.c:763
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (work in another window, move the mouse, utilize the\n"
@@ -1292,33 +1300,33 @@ msgstr ""
 "premiers ; cela donne au g�n�rateur de nombres al�atoires une meilleure\n"
 "chance d'avoir assez d'entropie.\n"
 
-#: g10/keygen.c:825
+#: g10/keygen.c:833
 msgid "Key generation can only be used in interactive mode\n"
 msgstr "La g�n�ration de cl� ne peut �tre faite qu'en mode interactif\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:841
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La paire de cl�s DSA fera 1024 bits.\n"
 
-#: g10/keygen.c:839
+#: g10/keygen.c:847
 msgid "Key generation cancelled.\n"
 msgstr "La g�n�ration a �t� annul�e.\n"
 
-#: g10/keygen.c:849
+#: g10/keygen.c:857
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "�criture d'un certificat public � `%s'\n"
 
-#: g10/keygen.c:850
+#: g10/keygen.c:858
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "�criture d'un certificat secret � `%s'\n"
 
-#: g10/keygen.c:927
+#: g10/keygen.c:935
 msgid "public and secret key created and signed.\n"
 msgstr "les cl�s publique et secr�te ont �t� cr��es et sign�es.\n"
 
-#: g10/keygen.c:929
+#: g10/keygen.c:937
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -1328,28 +1336,28 @@ msgstr ""
 "utiliser la commande � --add-key � pour g�n�rer une cl� secondaire �\n"
 "cette fin.\n"
 
-#: g10/keygen.c:943 g10/keygen.c:1042
+#: g10/keygen.c:951 g10/keygen.c:1050
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La g�n�ration de cl� a �chou� : %s\n"
 
-#: g10/keygen.c:987 g10/sig-check.c:172 g10/sign.c:52
+#: g10/keygen.c:995 g10/sig-check.c:209 g10/sign.c:52
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "cl� publique cr��e %lu %s dans le futur\n"
 
-#: g10/keygen.c:989 g10/sig-check.c:174 g10/sign.c:54
+#: g10/keygen.c:997 g10/sig-check.c:211 g10/sign.c:54
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "cl� publique cr��e %lu %s dans le futur\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:1028
 msgid "Really create? "
 msgstr "Cr�er vraiment ? "
 
-#: g10/encode.c:88 g10/openfile.c:86 g10/openfile.c:169 g10/tdbio.c:467
+#: g10/encode.c:88 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
 #: g10/tdbio.c:527
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1360,17 +1368,17 @@ msgstr "%s : ne peut ouvrir : %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "erreur pendant la cr�ation du mot de passe : %s\n"
 
-#: g10/encode.c:155 g10/encode.c:269
+#: g10/encode.c:161 g10/encode.c:275
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s : ATTENTION : fichier vide\n"
 
-#: g10/encode.c:222
+#: g10/encode.c:228
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lecture de `%s'\n"
 
-#: g10/encode.c:397
+#: g10/encode.c:403
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s chiffr� pour : %s\n"
@@ -1402,14 +1410,14 @@ msgstr "trop d'entr�es dans le cache pk - d�sactiv�\n"
 msgid "too many entries in unk cache - disabled\n"
 msgstr "trop d'entr�es dans le cache unk - d�sactiv�\n"
 
-#: g10/getkey.c:1496 g10/getkey.c:1552
+#: g10/getkey.c:1502 g10/getkey.c:1558
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr ""
 "utilisation de la cl� secondaire %08lX � la place de la cl�\n"
 "principale %08lX\n"
 
-#: g10/import.c:116 g10/trustdb.c:1318
+#: g10/import.c:116 g10/trustdb.c:1228
 #, c-format
 msgid "can't open file: %s\n"
 msgstr "ne peut ouvrir le fichier : %s\n"
@@ -1419,12 +1427,12 @@ msgstr "ne peut ouvrir le fichier : %s\n"
 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:1635 g10/trustdb.c:1704
+#: g10/import.c:167 g10/trustdb.c:1564 g10/trustdb.c:1637
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu cl�s trait�es jusqu'ici\n"
 
-#: g10/import.c:172 g10/trustdb.c:1394
+#: g10/import.c:172 g10/trustdb.c:1304
 #, c-format
 msgid "read error: %s\n"
 msgstr "erreur de lecture : %s\n"
@@ -1507,7 +1515,7 @@ msgstr "cl� %08lX : cl� publique pas trouv�e: %s\n"
 msgid "no default public keyring\n"
 msgstr "pas de porte-cl�s public par d�faut\n"
 
-#: g10/import.c:374 g10/openfile.c:113 g10/sign.c:215 g10/sign.c:601
+#: g10/import.c:374 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:498
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
@@ -2077,71 +2085,75 @@ msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 msgid "No user id with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1372
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Pas de cl� secondaire avec l'index %d\n"
 
-#: g10/mainproc.c:199
+#: g10/mainproc.c:202
 msgid "public key encrypted data: good DEK\n"
 msgstr "donn�es chiffr�es avec la cl� publique : bonne cl� de chiffrement\n"
 
-#: g10/mainproc.c:202
+#. 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 conetxt.  do_proc_packets can then use
+#. * this list to display some information
+#: g10/mainproc.c:209
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "le d�chiffrement de la cl� publique a �chou� : %s\n"
 
-#: g10/mainproc.c:229
+#: g10/mainproc.c:236
 msgid "decryption okay\n"
 msgstr "le d�chiffrement a r�ussi\n"
 
-#: g10/mainproc.c:232
+#: g10/mainproc.c:239
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le d�chiffrement a �chou� : %s\n"
 
-#: g10/mainproc.c:249
+#: g10/mainproc.c:256
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE : l'exp�diteur a demand� � pour vos yeux seulement �\n"
 
-#: g10/mainproc.c:251
+#: g10/mainproc.c:258
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original : '%.*s'\n"
 
-#: g10/mainproc.c:831
+#: g10/mainproc.c:839
 msgid "signature verification suppressed\n"
 msgstr "v�rification de signature supprim�e\n"
 
-#: g10/mainproc.c:837
+#: g10/mainproc.c:845
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signature faite %.*s avec une cl� %s ID %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:863 g10/mainproc.c:874
+#: g10/mainproc.c:871 g10/mainproc.c:882
 msgid "BAD signature from \""
 msgstr "MAUVAISE signature de \""
 
-#: g10/mainproc.c:864 g10/mainproc.c:875
+#: g10/mainproc.c:872 g10/mainproc.c:883
 msgid "Good signature from \""
 msgstr "Bonne signature de \""
 
-#: g10/mainproc.c:866
+#: g10/mainproc.c:874
 #, fuzzy
 msgid "                aka \""
 msgstr "                      import�e : %lu"
 
-#: g10/mainproc.c:908
+#: g10/mainproc.c:916
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne peut v�rifier la signature : %s\n"
 
-#: g10/mainproc.c:981
+#: g10/mainproc.c:989
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:986
+#: g10/mainproc.c:994
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
@@ -2262,29 +2274,29 @@ msgstr "Mot de passe invalide ; r�essayez...\n"
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ATTENTION : Mauvaise cl� d�tect�e - changez encore le mot de passe.\n"
 
-#: g10/sig-check.c:155
+#: g10/sig-check.c:192
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "Ceci est une cl� ElGamal g�n�r�e par PGP qui n'est PAS s�re pour les\n"
 "signatures!\n"
 
-#: g10/sig-check.c:163
+#: g10/sig-check.c:200
 #, fuzzy, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "lid %lu : utilisateur sans signature\n"
 
-#: g10/sig-check.c:164
+#: g10/sig-check.c:201
 #, fuzzy, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "lid %lu : utilisateur sans signature\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:217
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTE : la cl� de signature a expir� le %s\n"
 
-#: g10/sig-check.c:237
+#: g10/sig-check.c:274
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "la signature est suppos�e �tre fausse car un bit critique est\n"
@@ -2295,7 +2307,7 @@ msgstr ""
 msgid "%s signature from: %s\n"
 msgstr "Signature %s de : %s\n"
 
-#: g10/sign.c:210 g10/sign.c:596
+#: g10/sign.c:210 g10/sign.c:493
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "ne peut cr�er %s : %s\n"
@@ -2309,11 +2321,16 @@ msgstr "signature :"
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENTION : `%s' est un fichier vide\n"
 
-#: g10/textfilter.c:199
+#: g10/textfilter.c:122
 #, fuzzy, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "armure invalide : ligne plus longue que %d caract�res\n"
 
+#: g10/textfilter.c:189
+#, fuzzy, c-format
+msgid "input line longer than %d characters\n"
+msgstr "armure invalide : ligne plus longue que %d caract�res\n"
+
 #: g10/tdbio.c:117 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
@@ -2335,12 +2352,12 @@ msgstr "transaction de base de confiance trop volumineuse\n"
 msgid "%s: can't access: %s\n"
 msgstr "%s : ne peut acc�der : %s\n"
 
-#: g10/ringedit.c:294 g10/tdbio.c:444
+#: g10/ringedit.c:296 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s : ne peut cr�er le r�pertoire : %s\n"
 
-#: g10/ringedit.c:300 g10/tdbio.c:447
+#: g10/ringedit.c:302 g10/tdbio.c:447
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s : r�pertoire cr��\n"
@@ -2350,7 +2367,7 @@ msgstr "%s : r�pertoire cr��\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s : le r�pertoire n'existe pas !\n"
 
-#: g10/openfile.c:109 g10/openfile.c:176 g10/ringedit.c:1310 g10/tdbio.c:457
+#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1325 g10/tdbio.c:457
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s : ne peut cr�er : %s\n"
@@ -2449,169 +2466,169 @@ msgstr "%s : n'a pu mettre un enregistrement � z�ro : %s\n"
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s : n'a pas pu ajouter un enregistrement : %s\n"
 
-#: g10/trustdb.c:144
+#: g10/trustdb.c:165
 msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
 msgstr ""
 "La base de confiance est corrompue ; ex�cutez � gpgm --fix-trustdb �.\n"
 
-#: g10/trustdb.c:157
+#: g10/trustdb.c:178
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 "enregistrement de confiance %lu, type de requ�te %d : la lecture a �chou� : "
 "%s\n"
 
-#: g10/trustdb.c:172
+#: g10/trustdb.c:193
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "enregistrement de confiance %lu, type %d : l'�criture a �chou� : %s\n"
 
-#: g10/trustdb.c:186
+#: g10/trustdb.c:207
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "enregistrement de confiance %lu : la suppression a �chou� : %s\n"
 
-#: g10/trustdb.c:200
+#: g10/trustdb.c:221
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de confiance : la synchronisation a �chou� : %s\n"
 
-#: g10/trustdb.c:329
+#: g10/trustdb.c:351
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr ""
 "erreur pendant la lecture de l'enregistrement de r�pertoire pour\n"
 "le LID %lu : %s\n"
 
-#: g10/trustdb.c:336
+#: g10/trustdb.c:358
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu : enregistrement de r�pertoire attendu, a re�u le type %d\n"
 
-#: g10/trustdb.c:341
+#: g10/trustdb.c:363
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "pas de cl� principale pour le LID %lu\n"
 
-#: g10/trustdb.c:346
+#: g10/trustdb.c:368
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "erreur pendant la lecture de la cl� principale pour le LID %lu : %s\n"
 
-#: g10/trustdb.c:422
+#: g10/trustdb.c:445
 #, c-format
 msgid "chained sigrec %lu has a wrong owner\n"
 msgstr "l'enregistrement de signature %lu a un mauvais propri�taire\n"
 
-#: g10/trustdb.c:465
+#: g10/trustdb.c:488
 #, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "'%s' n'est pas une identification longue de cl� valide\n"
 
-#: g10/trustdb.c:500
+#: g10/trustdb.c:523
 #, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr "cl� %08lX : pas de cl� publique pour la cl� certifi�e - ignor�e\n"
 
-#: g10/trustdb.c:509 g10/trustdb.c:567
+#: g10/trustdb.c:532 g10/trustdb.c:590
 #, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "cl� %08lX : ne peut �tre mise dans la base de confiance\n"
 
-#: g10/trustdb.c:514 g10/trustdb.c:573
+#: g10/trustdb.c:537 g10/trustdb.c:596
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "cl� %08lX : l'enregistrement de requ�te a �chou�\n"
 
-#: g10/trustdb.c:519 g10/trustdb.c:582
+#: g10/trustdb.c:542 g10/trustdb.c:605
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "cl� %08lX : d�j� dans la table des cl�s certifi�es\n"
 
-#: g10/trustdb.c:522 g10/trustdb.c:585
+#: g10/trustdb.c:545 g10/trustdb.c:608
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "cl� %08lX : accept�e comme cl� certifi�e.\n"
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:561
 #, c-format
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "NOTE : la cl� secr�te %08lX n'est PAS prot�g�e.\n"
 
-#: g10/trustdb.c:550
+#: g10/trustdb.c:573
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "cl� %08lX : cl� secr�te sans cl� publique - non prise en compte\n"
 
-#: g10/trustdb.c:557
+#: g10/trustdb.c:580
 #, c-format
 msgid "key %08lX: secret and public key don't match\n"
 msgstr "cl� %08lX : les cl�s secr�te et publique ne correspondent pas\n"
 
-#: g10/trustdb.c:593
+#: g10/trustdb.c:616
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "l'�num�ration des cl�s secr�tes a �chou� : %s\n"
 
-#: g10/trustdb.c:776
+#: g10/trustdb.c:770
 #, c-format
 msgid "lid %lu: read dir record failed: %s\n"
 msgstr "lid %lu : la lecture d'enregistrement de r�pertoire a �chou� : %s\n"
 
-#: g10/trustdb.c:785
+#: g10/trustdb.c:779
 #, c-format
 msgid "lid %lu: read key record failed: %s\n"
 msgstr "lid %lu : la lecture de l''enregistrement de cl� a �chou� : %s\n"
 
-#: g10/trustdb.c:795
+#: g10/trustdb.c:789
 #, c-format
 msgid "lid %lu: read uid record failed: %s\n"
 msgstr "lid %lu : la lecture d'enregistrement d'uid a �chou� : %s\n"
 
-#: g10/trustdb.c:804
+#: g10/trustdb.c:798
 #, c-format
 msgid "lid %lu: read pref record failed: %s\n"
 msgstr "lid %lu : la lecture d'enregistrement de pr�f�rences a �chou� : %s\n"
 
-#: g10/trustdb.c:814
+#: g10/trustdb.c:808
 #, c-format
 msgid "lid %lu: read sig record failed: %s\n"
 msgstr "lid %lu : la lecture d'enregistrement de signature a �chou� : %s\n"
 
-#: g10/trustdb.c:1151
+#: g10/trustdb.c:1037
 msgid "Ooops, no keys\n"
 msgstr "Ooops, pas de cl�\n"
 
-#: g10/trustdb.c:1155
+#: g10/trustdb.c:1041
 msgid "Ooops, no user ids\n"
 msgstr "Ooops, pas de nom d'utilisateur\n"
 
-#: g10/trustdb.c:1226 g10/trustdb.c:1244
+#: g10/trustdb.c:1134 g10/trustdb.c:1152
 #, c-format
 msgid "user '%s' read problem: %s\n"
 msgstr "probl�me de lecture de l'utilisateur '%s' : %s\n"
 
-#: g10/trustdb.c:1229 g10/trustdb.c:1247
+#: g10/trustdb.c:1137 g10/trustdb.c:1155
 #, c-format
 msgid "user '%s' list problem: %s\n"
 msgstr "probl�me de liste � l'utilisateur '%s' : %s\n"
 
-#: g10/trustdb.c:1237 g10/trustdb.c:1485
+#: g10/trustdb.c:1145 g10/trustdb.c:1447
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "l'utilisateur '%s' n'a pas �t� trouv� : %s\n"
 
-#: g10/trustdb.c:1239 g10/trustdb.c:1487
+#: g10/trustdb.c:1147 g10/trustdb.c:1449
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "probl�me de recherche de '%s' dans la base de confiance : %s\n"
 
-#: g10/trustdb.c:1242
+#: g10/trustdb.c:1150
 #, c-format
 msgid "user '%s' not in trustdb\n"
 msgstr "l'utilisateur '%s' n'est pas dans la base de confiance\n"
 
-#: g10/trustdb.c:1277
+#: g10/trustdb.c:1186
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -2620,208 +2637,208 @@ msgstr ""
 "# Liste des indices de confiance assign�s, cr��e le %s\n"
 "# (Utiliser � gpgm --import-ownertrust � pour les restaurer)\n"
 
-#: g10/trustdb.c:1283
+#: g10/trustdb.c:1192
 msgid "directory record w/o primary key\n"
 msgstr "enregistrement de r�pertoire sans cl� principale\n"
 
-#: g10/trustdb.c:1290
+#: g10/trustdb.c:1199
 #, c-format
 msgid "error reading key record: %s\n"
 msgstr "erreur pendant la lecture de l'enregistrement de cl� : %s\n"
 
-#: g10/trustdb.c:1330
+#: g10/trustdb.c:1240
 msgid "line too long\n"
 msgstr "ligne trop longue\n"
 
-#: g10/trustdb.c:1338
+#: g10/trustdb.c:1248
 msgid "error: missing colon\n"
 msgstr "erreur : deux-points manquant\n"
 
-#: g10/trustdb.c:1343
+#: g10/trustdb.c:1253
 msgid "error: invalid fingerprint\n"
 msgstr "erreur : empreinte digitale invalide\n"
 
-#: g10/trustdb.c:1347
+#: g10/trustdb.c:1257
 msgid "error: no ownertrust value\n"
 msgstr "erreur : pas d'indice de confiance\n"
 
-#: g10/trustdb.c:1372
+#: g10/trustdb.c:1282
 msgid "key not in trustdb, searching ring.\n"
 msgstr "la cl� n'est pas dans la base de confiance, recherche du porte-cl�s.\n"
 
-#: g10/trustdb.c:1375
+#: g10/trustdb.c:1285
 #, c-format
 msgid "key not in ring: %s\n"
 msgstr "cl� absente du porte-cl�s : %s\n"
 
-#: g10/trustdb.c:1379
+#: g10/trustdb.c:1289
 msgid "Oops: key is now in trustdb???\n"
 msgstr "Oops : la cl� est maintenant dans la base de confiance ???\n"
 
 #. update the ownertrust
-#: g10/trustdb.c:1384
+#: g10/trustdb.c:1294
 #, c-format
 msgid "insert trust record failed: %s\n"
 msgstr "l'insertion d'enregistrement de confiance a �chou� : %s\n"
 
 #. error
-#: g10/trustdb.c:1390
+#: g10/trustdb.c:1300
 #, c-format
 msgid "error finding dir record: %s\n"
 msgstr "erreur pendant la recherche de l'enregistrement de r�pertoire : %s\n"
 
-#: g10/trustdb.c:1490
+#: g10/trustdb.c:1452
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "l'utilisateur '%s' n'est pas dans la base de confiance - insertion\n"
 
-#: g10/trustdb.c:1493
+#: g10/trustdb.c:1455
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "n'a pas pu ins�rer '%s' dans la base de confiance : %s\n"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1494
 #, c-format
 msgid "%s: keyblock read problem: %s\n"
 msgstr "%s : probl�me de lecture du bloc de cl�s : %s\n"
 
-#: g10/trustdb.c:1579
+#: g10/trustdb.c:1508
 #, c-format
 msgid "%s: update failed: %s\n"
 msgstr "%s : la mise � jour a �chou� : %s\n"
 
-#: g10/trustdb.c:1582
+#: g10/trustdb.c:1511
 #, c-format
 msgid "%s: updated\n"
 msgstr "%s : mis � jour\n"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1513
 #, c-format
 msgid "%s: okay\n"
 msgstr "%s : OK\n"
 
-#: g10/trustdb.c:1599
+#: g10/trustdb.c:1528
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu : enregistrement de r�pertoire sans cl� - ignor�\n"
 
-#: g10/trustdb.c:1612
+#: g10/trustdb.c:1541
 #, c-format
 msgid "lid %lu: keyblock not found: %s\n"
 msgstr "lid %lu : le bloc de cl�s n'a pas �t� trouv� : %s\n"
 
-#: g10/trustdb.c:1621 g10/trustdb.c:1690
+#: g10/trustdb.c:1550 g10/trustdb.c:1623
 #, c-format
 msgid "lid %lu: update failed: %s\n"
 msgstr "lid %lu : la mise � jour a �chou�: %s\n"
 
-#: g10/trustdb.c:1627 g10/trustdb.c:1696
+#: g10/trustdb.c:1556 g10/trustdb.c:1629
 #, c-format
 msgid "lid %lu: updated\n"
 msgstr "lid %lu : mis � jour\n"
 
-#: g10/trustdb.c:1631 g10/trustdb.c:1700
+#: g10/trustdb.c:1560 g10/trustdb.c:1633
 #, c-format
 msgid "lid %lu: okay\n"
 msgstr "lid %lu : OK\n"
 
-#: g10/trustdb.c:1638 g10/trustdb.c:1706
+#: g10/trustdb.c:1567 g10/trustdb.c:1639
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu cl�s trait�es\n"
 
-#: g10/trustdb.c:1640
+#: g10/trustdb.c:1569
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu cl�s ignor�es\n"
 
-#: g10/trustdb.c:1642 g10/trustdb.c:1708
+#: g10/trustdb.c:1571 g10/trustdb.c:1641
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu cl�s avec erreurs\n"
 
-#: g10/trustdb.c:1644 g10/trustdb.c:1710
+#: g10/trustdb.c:1573 g10/trustdb.c:1643
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu cl�s mises � jour\n"
 
-#: g10/trustdb.c:1674
+#: g10/trustdb.c:1607
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ? : l'insertion a �chou� : %s\n"
 
-#: g10/trustdb.c:1679
+#: g10/trustdb.c:1612
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu : l'insertion a �chou� : %s\n"
 
-#: g10/trustdb.c:1685
+#: g10/trustdb.c:1618
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu : ins�r�\n"
 
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1645
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu cl�s ins�r�es\n"
 
-#: g10/trustdb.c:1715
+#: g10/trustdb.c:1648
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "l'�num�ration des blocs de cl�s a �chou� : %s\n"
 
-#: g10/trustdb.c:1760
+#: g10/trustdb.c:1694
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr ""
 "check_trust : la recherche d'enregistrement de r�pertoire a �chou� : %s\n"
 
-#: g10/trustdb.c:1767
+#: g10/trustdb.c:1701
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "cl� %08lX : l'insertion d'enregistrement de confiance a �chou� : %s\n"
 
-#: g10/trustdb.c:1771
+#: g10/trustdb.c:1705
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "cl� %08lX.%lu : ins�r�e dans la base de confiance\n"
 
-#: g10/trustdb.c:1779
+#: g10/trustdb.c:1713
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "cl� %08lX.%lu : cr��e dans le futur (voyage temporel ou\n"
 "probl�me d'horloge)\n"
 
-#: g10/trustdb.c:1786
+#: g10/trustdb.c:1720
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "cl� %08lX.%lu : a expir� le %s\n"
 
-#: g10/trustdb.c:1794
+#: g10/trustdb.c:1728
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "cl� %08lX.%lu : la v�rification de confiance a �chou�: %s\n"
 
-#: g10/trustdb.c:2003 g10/trustdb.c:2032 g10/trustdb.c:2771
+#: g10/trustdb.c:1951 g10/trustdb.c:1981 g10/trustdb.c:2734
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr ""
 "ATTENTION : les enregistrements de pr�f�rences longs ne sont pas encore\n"
 "support�s\n"
 
-#: g10/trustdb.c:2054
+#: g10/trustdb.c:2003
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record : search_record a �chou� : %s\n"
 
-#: g10/trustdb.c:2117
+#: g10/trustdb.c:2071
 #, c-format
 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"
 "de %lu mais marqu� comme v�rifi�\n"
 
-#: g10/trustdb.c:2121
+#: g10/trustdb.c:2075
 #, c-format
 msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n"
 msgstr ""
@@ -2829,147 +2846,147 @@ msgstr ""
 "de %lu mais n'est pas marqu�\n"
 
 #. we need the dir record
-#: g10/trustdb.c:2128
+#: g10/trustdb.c:2082
 #, c-format
 msgid "sig rec %lu[%d] in hintlist of %lu does not point to a dir record\n"
 msgstr ""
 "l'enregistrement de signature %lu[%d] dans la liste d'aide de %lu\n"
 "ne pointe pas vers un enregistrement de r�pertoire\n"
 
-#: g10/trustdb.c:2134
+#: g10/trustdb.c:2088
 #, c-format
 msgid "lid %lu: no primary key\n"
 msgstr "lid %lu : pas de cl� primaire\n"
 
-#: g10/trustdb.c:2167
+#: g10/trustdb.c:2121
 #, c-format
 msgid "lid %lu: user id not found in keyblock\n"
 msgstr "lid %lu : utilisateur non trouv� dans le bloc de cl�s\n"
 
-#: g10/trustdb.c:2171
+#: g10/trustdb.c:2125
 #, c-format
 msgid "lid %lu: user id without signature\n"
 msgstr "lid %lu : utilisateur sans signature\n"
 
-#: g10/trustdb.c:2178
+#: g10/trustdb.c:2132
 #, c-format
 msgid "lid %lu: self-signature in hintlist\n"
 msgstr "lid %lu : auto-signature dans la liste d'aide\n"
 
-#: g10/trustdb.c:2189 g10/trustdb.c:2910 g10/trustdb.c:2994
+#: g10/trustdb.c:2143 g10/trustdb.c:2879 g10/trustdb.c:2962
 msgid "Valid certificate revocation"
 msgstr "Certificat de r�vocation valide"
 
-#: g10/trustdb.c:2190 g10/trustdb.c:2911 g10/trustdb.c:2995
+#: g10/trustdb.c:2144 g10/trustdb.c:2880 g10/trustdb.c:2963
 msgid "Good certificate"
 msgstr "Bon certificat"
 
-#: g10/trustdb.c:2199
+#: g10/trustdb.c:2153
 msgid "very strange: no public key\n"
 msgstr "tr�s �trange : pas de cl� publique\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2201
 #, c-format
 msgid "hintlist %lu[%d] of %lu does not point to a dir record\n"
 msgstr ""
 "la liste d'aide de %lu[%d] de %lu ne pointe pas vers un enregistrement\n"
 "de r�pertoire\n"
 
-#: g10/trustdb.c:2253
+#: g10/trustdb.c:2207
 #, c-format
 msgid "lid %lu does not have a key\n"
 msgstr "la lid %lu n'a pas de cl�\n"
 
-#: g10/trustdb.c:2263
+#: g10/trustdb.c:2217
 #, c-format
 msgid "lid %lu: can't get keyblock: %s\n"
 msgstr "lid %lu: ne peut obtenir le bloc de cl�s: %s\n"
 
-#: g10/trustdb.c:2320 g10/trustdb.c:3245
+#: g10/trustdb.c:2274 g10/trustdb.c:3227
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir a �chou� : %s\n"
 
-#: g10/trustdb.c:2473
+#: g10/trustdb.c:2427
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "cl� %08lX.%lu : bonne liaison avec la sous-cl�\n"
 
-#: g10/trustdb.c:2479 g10/trustdb.c:2521
+#: g10/trustdb.c:2433 g10/trustdb.c:2475
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "cl� %08lX.%lu : liaison avec la sous-cl� invalide : %s\n"
 
-#: g10/trustdb.c:2494
+#: g10/trustdb.c:2448
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "cl� %08lX.%lu : r�vocation de cl� valide\n"
 
-#: g10/trustdb.c:2500
+#: g10/trustdb.c:2454
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "cl� %08lX.%lu : r�vocation de sous-cl� invalide : %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2469
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "cl� %08lX.%lu : r�vocation de sous-cl� valide\n"
 
-#: g10/trustdb.c:2615
+#: g10/trustdb.c:2573
 msgid "Good self-signature"
 msgstr "Bonne auto-signature"
 
-#: g10/trustdb.c:2626
+#: g10/trustdb.c:2584
 msgid "Invalid self-signature"
 msgstr "Auto-signature invalide"
 
-#: g10/trustdb.c:2636
+#: g10/trustdb.c:2594
 msgid "Valid user ID revocation skipped due to a newer self signature\n"
 msgstr ""
 "La r�vocation valide de nom d'utilisateur a �t� ignor�e car l'auto-\n"
 "signature est plus r�cente\n"
 
-#: g10/trustdb.c:2643
+#: g10/trustdb.c:2601
 msgid "Valid user ID revocation\n"
 msgstr "R�vocation de nom d'utilisateur valide\n"
 
-#: g10/trustdb.c:2650
+#: g10/trustdb.c:2608
 msgid "Invalid user ID revocation"
 msgstr "R�vocation de nom d'utilisateur invalide"
 
-#: g10/trustdb.c:2734
+#: g10/trustdb.c:2697
 msgid "Too many preferences"
 msgstr "Trop de pr�f�rences"
 
-#: g10/trustdb.c:2748
+#: g10/trustdb.c:2711
 msgid "Too many preference items"
 msgstr "Trop d'items de pr�f�rence"
 
-#: g10/trustdb.c:2888
+#: g10/trustdb.c:2857
 #, fuzzy
 msgid "duplicated certificate - deleted"
 msgstr "Certificat dupliqu� - enlev�"
 
-#: g10/trustdb.c:2922
+#: g10/trustdb.c:2891
 msgid "Hmmm, public key lost?"
 msgstr "Hmmm, cl� publique perdue ?"
 
-#: g10/trustdb.c:2932 g10/trustdb.c:3015
+#: g10/trustdb.c:2900 g10/trustdb.c:2983
 msgid "Invalid certificate revocation"
 msgstr "R�vocation de certificat invalide"
 
-#: g10/trustdb.c:2933 g10/trustdb.c:3016
+#: g10/trustdb.c:2901 g10/trustdb.c:2984
 msgid "Invalid certificate"
 msgstr "Certificat invalide"
 
-#: g10/trustdb.c:2948
+#: g10/trustdb.c:2916
 #, c-format
 msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n"
 msgstr ""
 "uid %08lX.%lu/%02X%02X : poss�de une ombre %lu mais n'est pas encore\n"
 "marqu�.\n"
 
-#: g10/trustdb.c:2962
+#: g10/trustdb.c:2930
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr ""
@@ -2977,41 +2994,41 @@ msgstr ""
 "enregistrement de r�pertoire\n"
 
 #. that should never happen
-#: g10/trustdb.c:3215
+#: g10/trustdb.c:3190
 #, c-format
 msgid "insert_trust_record: keyblock not found: %s\n"
 msgstr "insert_trust_record : bloc de cl�s non trouv� : %s\n"
 
-#: g10/trustdb.c:3233
+#: g10/trustdb.c:3215
 msgid "did not use primary key for insert_trust_record()\n"
 msgstr "n'a pas utilis� la cl� principale pour � insert_trust_record() �\n"
 
-#: g10/ringedit.c:314
+#: g10/ringedit.c:316
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s : ne peut cr�er le porte-cl�s : %s\n"
 
-#: g10/ringedit.c:320 g10/ringedit.c:1315
+#: g10/ringedit.c:322 g10/ringedit.c:1330
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s : porte-cl�s cr��\n"
 
-#: g10/ringedit.c:1492
+#: g10/ringedit.c:1507
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 "ATTENTION : 2 fichiers avec des informations confidentielles existent.\n"
 
-#: g10/ringedit.c:1493
+#: g10/ringedit.c:1508
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s est le fichier original\n"
 
-#: g10/ringedit.c:1494
+#: g10/ringedit.c:1509
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s est le nouveau\n"
 
-#: g10/ringedit.c:1495
+#: g10/ringedit.c:1510
 msgid "Please fix this possible security flaw\n"
 msgstr "R�parez ce probl�me de s�curit� possible\n"
 
@@ -3047,12 +3064,12 @@ msgstr "R��crire (o/N)? "
 msgid "writing to stdout\n"
 msgstr "�criture vers la sortie standard\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "les donn�es sign�es sont suppos�es �tre dans `%s'\n"
 
-#: g10/openfile.c:192
+#: g10/openfile.c:197
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s : nouveau fichier d'options cr��\n"
diff --git a/po/it.po b/po/it.po
index f54b0e5c1..2ae09a2b1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-0.4.3\n"
-"POT-Creation-Date: 1999-02-19 15:31+0100\n"
+"POT-Creation-Date: 1999-03-08 19:50+0100\n"
 "PO-Revision-Date: 1998-11-09 16:19+01:00\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -13,15 +13,15 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:77
+#: util/secmem.c:76
 msgid "Warning: using insecure memory!\n"
 msgstr "Attenzione: si sta usando memoria insicura!\n"
 
-#: util/secmem.c:250
+#: util/secmem.c:249
 msgid "operation is not possible without initialized secure memory\n"
 msgstr ""
 
-#: util/secmem.c:251
+#: util/secmem.c:250
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
@@ -295,7 +295,7 @@ msgstr ""
 "Il generatore di numeri casuali � solo un ripiego per fare\n"
 "compilare il programma - non � assolutamente un RNG forte!\n"
 
-#: cipher/rndlinux.c:118
+#: cipher/rndlinux.c:114
 #, c-format
 msgid ""
 "\n"
@@ -482,7 +482,10 @@ msgstr "meno prolisso"
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#. { oDryRun, "dry-run",   0, N_("do not make any changes") },
+#: g10/g10.c:235
+msgid "do not make any changes"
+msgstr ""
+
 #: g10/g10.c:236
 msgid "batch mode: never ask"
 msgstr "modo batch: non fare domande"
@@ -669,124 +672,124 @@ msgstr "file con opzioni predefinite `%s': %s\n"
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:796
+#: g10/g10.c:797
 #, fuzzy, c-format
 msgid "%s is not a valid character set\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/g10.c:836 g10/g10.c:848
+#: g10/g10.c:837 g10/g10.c:849
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:842 g10/g10.c:854
+#: g10/g10.c:843 g10/g10.c:855
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:857
+#: g10/g10.c:858
 #, 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:859
+#: g10/g10.c:860
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:861
+#: g10/g10.c:862
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:863
+#: g10/g10.c:864
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:866
+#: g10/g10.c:867
 #, fuzzy
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "nota: il modo S2K semplice (0) � fortemente scoraggiato\n"
 
-#: g10/g10.c:870
+#: g10/g10.c:871
 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:947
+#: g10/g10.c:948
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:953
+#: g10/g10.c:954
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:961
+#: g10/g10.c:962
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:969
+#: g10/g10.c:970
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:982
+#: g10/g10.c:983
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:995
+#: g10/g10.c:996
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:1009
+#: g10/g10.c:1010
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1022
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:1030
+#: g10/g10.c:1031
 #, fuzzy
 msgid "--edit-key username [commands]"
 msgstr "--edit-key nomeutente"
 
-#: g10/g10.c:1046
+#: g10/g10.c:1047
 msgid "--delete-secret-key username"
 msgstr "--delete-secret-key nomeutente"
 
-#: g10/g10.c:1049
+#: g10/g10.c:1050
 msgid "--delete-key username"
 msgstr "--delete-key nomeutente"
 
-#: g10/encode.c:216 g10/g10.c:1072 g10/sign.c:311
+#: g10/encode.c:222 g10/g10.c:1073 g10/sign.c:311
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/g10.c:1083
+#: g10/g10.c:1084
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [userid] [portachiavi]"
 
-#: g10/g10.c:1144
+#: g10/g10.c:1145
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1152
+#: g10/g10.c:1153
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1219
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:1297
+#: g10/g10.c:1298
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:1301
+#: g10/g10.c:1302
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/decrypt.c:59 g10/g10.c:1304 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1305 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
@@ -867,7 +870,7 @@ msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 
-#: g10/pkclist.c:138
+#: g10/pkclist.c:136
 #, fuzzy, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -876,7 +879,7 @@ msgstr ""
 "Nessun valore di fiducia del proprietario definito per %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:148
+#: g10/pkclist.c:146
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -898,31 +901,31 @@ msgstr ""
 " 4 = Mi fido completamente\n"
 " s = mostrami ulteriori informazioni\n"
 
-#: g10/pkclist.c:157
+#: g10/pkclist.c:155
 msgid " m = back to the main menu\n"
 msgstr " m = ritorna al men� principale\n"
 
-#: g10/pkclist.c:159
+#: g10/pkclist.c:157
 msgid " q = quit\n"
 msgstr ""
 
 # 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:164
+#: g10/pkclist.c:162
 #, fuzzy
 msgid "sSmMqQ"
 msgstr "sSmMqQ"
 
-#: g10/pkclist.c:168
+#: g10/pkclist.c:166
 msgid "Your decision? "
 msgstr "Cosa hai deciso? "
 
-#: g10/pkclist.c:188
+#: g10/pkclist.c:186
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr ""
 
-#: g10/pkclist.c:223
+#: g10/pkclist.c:221
 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"
@@ -932,19 +935,19 @@ msgstr ""
 "se possiamo assegnare qualche valore di fiducia del proprietario mancante.\n"
 "\n"
 
-#: g10/pkclist.c:261
+#: g10/pkclist.c:260
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:263
+#: g10/pkclist.c:262
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:265
+#: g10/pkclist.c:264
 #, fuzzy
 msgid ""
 "No trust values changed.\n"
@@ -953,46 +956,46 @@ msgstr ""
 "Nessun valore di fiducia del proprietario modificato.\n"
 "\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "chiave %08lX: accettata come chiave segreta\n"
 
-#: g10/pkclist.c:286 g10/pkclist.c:381
+#: g10/pkclist.c:285 g10/pkclist.c:397
 msgid "Use this key anyway? "
 msgstr "Uso lo stesso questa chiave? "
 
-#: g10/pkclist.c:308
+#: g10/pkclist.c:309
 #, fuzzy, c-format
 msgid "%08lX: key has expired\n"
 msgstr "Nota: questa chiave � scaduta!\n"
 
-#: g10/pkclist.c:314
+#: g10/pkclist.c:315
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr ""
 
-#: g10/pkclist.c:332
+#: g10/pkclist.c:333
 #, fuzzy, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n"
 
-#: g10/pkclist.c:338
+#: g10/pkclist.c:339
 #, 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:344
+#: g10/pkclist.c:345
 msgid "This key probably belongs to the owner\n"
 msgstr ""
 
-#: g10/pkclist.c:349
+#: g10/pkclist.c:350
 msgid "This key belongs to us\n"
 msgstr ""
 
-#: g10/pkclist.c:376
+#: g10/pkclist.c:392
 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"
@@ -1004,56 +1007,56 @@ msgstr ""
 "prossima domanda.\n"
 "\n"
 
-#: g10/pkclist.c:385
+#: g10/pkclist.c:405
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENZIONE: uso di una chiave non fidata!\n"
 
-#: g10/pkclist.c:421
+#: g10/pkclist.c:441
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa chiave � stata revocata dal suo proprietario!\n"
 
-#: g10/pkclist.c:422
+#: g10/pkclist.c:442
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Questo pu� significare che la firma � stata falsificata.\n"
 
-#: g10/pkclist.c:443
+#: g10/pkclist.c:463
 msgid "Note: This key has expired!\n"
 msgstr "Nota: questa chiave � scaduta!\n"
 
-#: g10/pkclist.c:450
+#: g10/pkclist.c:470
 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:452
+#: g10/pkclist.c:472
 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:468
+#: g10/pkclist.c:488
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:489
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          La firma � probabilmente un FALSO.\n"
 
-#: g10/pkclist.c:476
+#: g10/pkclist.c:496
 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:479
+#: g10/pkclist.c:499
 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:532 g10/pkclist.c:545 g10/pkclist.c:607 g10/pkclist.c:635
+#: g10/pkclist.c:552 g10/pkclist.c:565 g10/pkclist.c:628 g10/pkclist.c:656
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: saltata: %s\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:574
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1061,20 +1064,20 @@ msgstr ""
 "Non hai specificato un user ID. (puoi usare \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:579
 msgid "Enter the user ID: "
 msgstr "Inserisci l'user ID: "
 
-#: g10/pkclist.c:570
+#: g10/pkclist.c:590
 msgid "No such user ID.\n"
 msgstr "User ID inesistente.\n"
 
-#: g10/pkclist.c:615
+#: g10/pkclist.c:636
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: errore nel controllare la chiave: %s\n"
 
-#: g10/pkclist.c:641
+#: g10/pkclist.c:662
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
@@ -1224,7 +1227,7 @@ msgstr "La chiave scadr� il %s\n"
 msgid "Is this correct (y/n)? "
 msgstr "� giusto (s/n)? "
 
-#: g10/keygen.c:582
+#: g10/keygen.c:583
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1240,23 +1243,23 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:593
+#: g10/keygen.c:594
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:597
+#: g10/keygen.c:598
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:599
+#: g10/keygen.c:600
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non pu� iniziare con una cifra\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:602
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:609
+#: g10/keygen.c:610
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
@@ -1272,7 +1275,12 @@ msgstr "Commento: "
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:655
+#: g10/keygen.c:657
+#, c-format
+msgid "You are using the `%s' character set.\n"
+msgstr ""
+
+#: g10/keygen.c:663
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1283,15 +1291,15 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:658
+#: g10/keygen.c:666
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:668
+#: g10/keygen.c:676
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
 
-#: g10/keygen.c:720
+#: g10/keygen.c:728
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1299,11 +1307,11 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:389 g10/keygen.c:728
+#: g10/keyedit.c:389 g10/keygen.c:736
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "passphrase non ripetuta correttamente; riprova.\n"
 
-#: g10/keygen.c:734
+#: g10/keygen.c:742
 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"
@@ -1315,7 +1323,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:755
+#: g10/keygen.c:763
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (work in another window, move the mouse, utilize the\n"
@@ -1329,33 +1337,33 @@ msgstr ""
 "generatore di numeri casuali la possibilit� di raccogliere abbastanza\n"
 "entropia.\n"
 
-#: g10/keygen.c:825
+#: g10/keygen.c:833
 msgid "Key generation can only be used in interactive mode\n"
 msgstr "Una chiave pu� essere generata solo in modo interattivo\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:841
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La coppia DSA avr� 1024 bit.\n"
 
-#: g10/keygen.c:839
+#: g10/keygen.c:847
 msgid "Key generation cancelled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:849
+#: g10/keygen.c:857
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "scrittura del certificato pubblico in `%s'\n"
 
-#: g10/keygen.c:850
+#: g10/keygen.c:858
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "scrittura del certificato privato in `%s'\n"
 
-#: g10/keygen.c:927
+#: g10/keygen.c:935
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:929
+#: g10/keygen.c:937
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -1365,12 +1373,12 @@ msgstr ""
 "vorrai usare il comando \"--add-key\" per generare una chiave secondaria\n"
 "per questo scopo.\n"
 
-#: g10/keygen.c:943 g10/keygen.c:1042
+#: g10/keygen.c:951 g10/keygen.c:1050
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:987 g10/sig-check.c:172 g10/sign.c:52
+#: g10/keygen.c:995 g10/sig-check.c:209 g10/sign.c:52
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1378,7 +1386,7 @@ msgstr ""
 "chiave pubblica creata nel futuro (salto nel tempo o problema con\n"
 "l'orologio)\n"
 
-#: g10/keygen.c:989 g10/sig-check.c:174 g10/sign.c:54
+#: g10/keygen.c:997 g10/sig-check.c:211 g10/sign.c:54
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1386,11 +1394,11 @@ msgstr ""
 "chiave pubblica creata nel futuro (salto nel tempo o problema con\n"
 "l'orologio)\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:1028
 msgid "Really create? "
 msgstr "Crea davvero? "
 
-#: g10/encode.c:88 g10/openfile.c:86 g10/openfile.c:169 g10/tdbio.c:467
+#: g10/encode.c:88 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
 #: g10/tdbio.c:527
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1401,17 +1409,17 @@ msgstr "%s: impossibile aprire: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/encode.c:155 g10/encode.c:269
+#: g10/encode.c:161 g10/encode.c:275
 #, fuzzy, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: attenzione: file vuoto\n"
 
-#: g10/encode.c:222
+#: g10/encode.c:228
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lettura da `%s'\n"
 
-#: g10/encode.c:397
+#: g10/encode.c:403
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s crittografato per: %s\n"
@@ -1444,12 +1452,12 @@ msgstr ""
 msgid "too many entries in unk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:1496 g10/getkey.c:1552
+#: g10/getkey.c:1502 g10/getkey.c:1558
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 
-#: g10/import.c:116 g10/trustdb.c:1318
+#: g10/import.c:116 g10/trustdb.c:1228
 #, c-format
 msgid "can't open file: %s\n"
 msgstr "impossibile aprire il file: %s\n"
@@ -1459,12 +1467,12 @@ msgstr "impossibile aprire il file: %s\n"
 msgid "skipping block of type %d\n"
 msgstr "salto un blocco di tipo %d\n"
 
-#: g10/import.c:167 g10/trustdb.c:1635 g10/trustdb.c:1704
+#: g10/import.c:167 g10/trustdb.c:1564 g10/trustdb.c:1637
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "Per ora sono state esaminate %lu chiavi\n"
 
-#: g10/import.c:172 g10/trustdb.c:1394
+#: g10/import.c:172 g10/trustdb.c:1304
 #, c-format
 msgid "read error: %s\n"
 msgstr "errore di lettura: %s\n"
@@ -1547,7 +1555,7 @@ msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 msgid "no default public keyring\n"
 msgstr "nessun portachiavi pubblico predefinito\n"
 
-#: g10/import.c:374 g10/openfile.c:113 g10/sign.c:215 g10/sign.c:601
+#: g10/import.c:374 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:498
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
@@ -2116,74 +2124,78 @@ msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 msgid "No user id with index %d\n"
 msgstr "Nessun user id con l'indice %d\n"
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1372
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nessuna chiave secondaria con l'indice %d\n"
 
-#: g10/mainproc.c:199
+#: g10/mainproc.c:202
 #, fuzzy
 msgid "public key encrypted data: good DEK\n"
 msgstr "Decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:202
+#. 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 conetxt.  do_proc_packets can then use
+#. * this list to display some information
+#: g10/mainproc.c:209
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:229
+#: g10/mainproc.c:236
 #, fuzzy
 msgid "decryption okay\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:232
+#: g10/mainproc.c:239
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:249
+#: g10/mainproc.c:256
 #, fuzzy
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "nota: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:251
+#: g10/mainproc.c:258
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:831
+#: g10/mainproc.c:839
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:837
+#: g10/mainproc.c:845
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Firma fatta %.*s usando %s key ID %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:863 g10/mainproc.c:874
+#: g10/mainproc.c:871 g10/mainproc.c:882
 msgid "BAD signature from \""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:864 g10/mainproc.c:875
+#: g10/mainproc.c:872 g10/mainproc.c:883
 msgid "Good signature from \""
 msgstr "Buona firma da \""
 
-#: g10/mainproc.c:866
+#: g10/mainproc.c:874
 #, fuzzy
 msgid "                aka \""
 msgstr "importate: %lu"
 
-#: g10/mainproc.c:908
+#: g10/mainproc.c:916
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:981
+#: g10/mainproc.c:989
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:986
+#: g10/mainproc.c:994
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -2306,28 +2318,28 @@ msgstr ""
 "Attenzione: individuata una chiave debole - per favore cambia ancora la\n"
 "passphrase.\n"
 
-#: g10/sig-check.c:155
+#: g10/sig-check.c:192
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "questa � una chiave ElGamal generata da PGP che NON � sicura per le firme!\n"
 
-#: g10/sig-check.c:163
+#: g10/sig-check.c:200
 #, fuzzy, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "chiave %08lX: user id senza firma\n"
 
-#: g10/sig-check.c:164
+#: g10/sig-check.c:201
 #, fuzzy, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "chiave %08lX: user id senza firma\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:217
 #, fuzzy, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "attenzione: firma della chiave scaduta il %s\n"
 
-#: g10/sig-check.c:237
+#: g10/sig-check.c:274
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
@@ -2336,7 +2348,7 @@ msgstr ""
 msgid "%s signature from: %s\n"
 msgstr "Firma NON corretta da \""
 
-#: g10/sign.c:210 g10/sign.c:596
+#: g10/sign.c:210 g10/sign.c:493
 #, fuzzy, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s: impossibile creare: %s\n"
@@ -2351,11 +2363,16 @@ msgstr "sign"
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "%s: attenzione: file vuoto\n"
 
-#: g10/textfilter.c:199
+#: g10/textfilter.c:122
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr ""
 
+#: g10/textfilter.c:189
+#, c-format
+msgid "input line longer than %d characters\n"
+msgstr ""
+
 #: g10/tdbio.c:117 g10/tdbio.c:1448
 #, fuzzy, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
@@ -2375,12 +2392,12 @@ msgstr ""
 msgid "%s: can't access: %s\n"
 msgstr "%s: impossibile creare: %s\n"
 
-#: g10/ringedit.c:294 g10/tdbio.c:444
+#: g10/ringedit.c:296 g10/tdbio.c:444
 #, fuzzy, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: impossibile creare: %s\n"
 
-#: g10/ringedit.c:300 g10/tdbio.c:447
+#: g10/ringedit.c:302 g10/tdbio.c:447
 #, fuzzy, c-format
 msgid "%s: directory created\n"
 msgstr "%s: impossibile creare: %s\n"
@@ -2390,7 +2407,7 @@ msgstr "%s: impossibile creare: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/openfile.c:109 g10/openfile.c:176 g10/ringedit.c:1310 g10/tdbio.c:457
+#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1325 g10/tdbio.c:457
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: impossibile creare: %s\n"
@@ -2486,551 +2503,551 @@ msgstr ""
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:144
+#: g10/trustdb.c:165
 #, fuzzy
 msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
 msgstr "Il trustdb � rovinato; per favore esegui \"gpgm --fix-trust-db\".\n"
 
-#: g10/trustdb.c:157
+#: g10/trustdb.c:178
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:172
+#: g10/trustdb.c:193
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:186
+#: g10/trustdb.c:207
 #, fuzzy, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/trustdb.c:200
+#: g10/trustdb.c:221
 #, fuzzy, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "aggiornamento del trustdb fallito: %s\n"
 
-#: g10/trustdb.c:329
+#: g10/trustdb.c:351
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:336
+#: g10/trustdb.c:358
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr ""
 
-#: g10/trustdb.c:341
+#: g10/trustdb.c:363
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr ""
 
-#: g10/trustdb.c:346
+#: g10/trustdb.c:368
 #, fuzzy, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/trustdb.c:422
+#: g10/trustdb.c:445
 #, c-format
 msgid "chained sigrec %lu has a wrong owner\n"
 msgstr "la chained sigrec %lu ha il proprietario sbagliato\n"
 
-#: g10/trustdb.c:465
+#: g10/trustdb.c:488
 #, fuzzy, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/trustdb.c:500
+#: g10/trustdb.c:523
 #, fuzzy, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
 
-#: g10/trustdb.c:509 g10/trustdb.c:567
+#: g10/trustdb.c:532 g10/trustdb.c:590
 #, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "chiave %08lX: impossibile metterla nel trustdb\n"
 
-#: g10/trustdb.c:514 g10/trustdb.c:573
+#: g10/trustdb.c:537 g10/trustdb.c:596
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "chiave %08lX: richiesta del record fallita\n"
 
-#: g10/trustdb.c:519 g10/trustdb.c:582
+#: g10/trustdb.c:542 g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "chiave %08lX: gi� nella tabella delle chiavi segrete\n"
 
-#: g10/trustdb.c:522 g10/trustdb.c:585
+#: g10/trustdb.c:545 g10/trustdb.c:608
 #, fuzzy, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "chiave %08lX: accettata come chiave segreta\n"
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:561
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#: g10/trustdb.c:550
+#: g10/trustdb.c:573
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
 
-#: g10/trustdb.c:557
+#: g10/trustdb.c:580
 #, c-format
 msgid "key %08lX: secret and public key don't match\n"
 msgstr "chiave %08lX: le chiavi segreta e pubblica non corrispondono\n"
 
-#: g10/trustdb.c:593
+#: g10/trustdb.c:616
 #, fuzzy, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enum_secret_keys fallito: %s\n"
 
-#: g10/trustdb.c:776
+#: g10/trustdb.c:770
 #, fuzzy, c-format
 msgid "lid %lu: read dir record failed: %s\n"
 msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n"
 
-#: g10/trustdb.c:785
+#: g10/trustdb.c:779
 #, fuzzy, c-format
 msgid "lid %lu: read key record failed: %s\n"
 msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n"
 
-#: g10/trustdb.c:795
+#: g10/trustdb.c:789
 #, fuzzy, c-format
 msgid "lid %lu: read uid record failed: %s\n"
 msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n"
 
-#: g10/trustdb.c:804
+#: g10/trustdb.c:798
 #, fuzzy, c-format
 msgid "lid %lu: read pref record failed: %s\n"
 msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n"
 
-#: g10/trustdb.c:814
+#: g10/trustdb.c:808
 #, fuzzy, c-format
 msgid "lid %lu: read sig record failed: %s\n"
 msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n"
 
-#: g10/trustdb.c:1151
+#: g10/trustdb.c:1037
 msgid "Ooops, no keys\n"
 msgstr ""
 
-#: g10/trustdb.c:1155
+#: g10/trustdb.c:1041
 #, fuzzy
 msgid "Ooops, no user ids\n"
 msgstr "elenca le chiavi e gli user id"
 
-#: g10/trustdb.c:1226 g10/trustdb.c:1244
+#: g10/trustdb.c:1134 g10/trustdb.c:1152
 #, fuzzy, c-format
 msgid "user '%s' read problem: %s\n"
 msgstr "%s: utente non trovato\n"
 
-#: g10/trustdb.c:1229 g10/trustdb.c:1247
+#: g10/trustdb.c:1137 g10/trustdb.c:1155
 #, fuzzy, c-format
 msgid "user '%s' list problem: %s\n"
 msgstr "%s: utente non trovato\n"
 
-#: g10/trustdb.c:1237 g10/trustdb.c:1485
+#: g10/trustdb.c:1145 g10/trustdb.c:1447
 #, fuzzy, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "%s: utente non trovato\n"
 
-#: g10/trustdb.c:1239 g10/trustdb.c:1487
+#: g10/trustdb.c:1147 g10/trustdb.c:1449
 #, fuzzy, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/trustdb.c:1242
+#: g10/trustdb.c:1150
 #, fuzzy, c-format
 msgid "user '%s' not in trustdb\n"
 msgstr "%s: utente non trovato\n"
 
-#: g10/trustdb.c:1277
+#: g10/trustdb.c:1186
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpgm --import-ownertrust\" to restore them)\n"
 msgstr ""
 
-#: g10/trustdb.c:1283
+#: g10/trustdb.c:1192
 msgid "directory record w/o primary key\n"
 msgstr ""
 
-#: g10/trustdb.c:1290
+#: g10/trustdb.c:1199
 #, fuzzy, c-format
 msgid "error reading key record: %s\n"
 msgstr "%s: errore nel controllare la chiave: %s\n"
 
-#: g10/trustdb.c:1330
+#: g10/trustdb.c:1240
 msgid "line too long\n"
 msgstr ""
 
-#: g10/trustdb.c:1338
+#: g10/trustdb.c:1248
 msgid "error: missing colon\n"
 msgstr ""
 
-#: g10/trustdb.c:1343
+#: g10/trustdb.c:1253
 #, fuzzy
 msgid "error: invalid fingerprint\n"
 msgstr "errore nella riga della coda\n"
 
-#: g10/trustdb.c:1347
+#: g10/trustdb.c:1257
 #, fuzzy
 msgid "error: no ownertrust value\n"
 msgstr "esporta i valori di fiducia"
 
-#: g10/trustdb.c:1372
+#: g10/trustdb.c:1282
 msgid "key not in trustdb, searching ring.\n"
 msgstr ""
 
-#: g10/trustdb.c:1375
+#: g10/trustdb.c:1285
 #, fuzzy, c-format
 msgid "key not in ring: %s\n"
 msgstr "impossibile scrivere il portachiavi: %s\n"
 
-#: g10/trustdb.c:1379
+#: g10/trustdb.c:1289
 msgid "Oops: key is now in trustdb???\n"
 msgstr ""
 
 #. update the ownertrust
-#: g10/trustdb.c:1384
+#: g10/trustdb.c:1294
 #, fuzzy, c-format
 msgid "insert trust record failed: %s\n"
 msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n"
 
 #. error
-#: g10/trustdb.c:1390
+#: g10/trustdb.c:1300
 #, fuzzy, c-format
 msgid "error finding dir record: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/trustdb.c:1490
+#: g10/trustdb.c:1452
 #, fuzzy, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "aggiornamento del trustdb fallito: %s\n"
 
-#: g10/trustdb.c:1493
+#: g10/trustdb.c:1455
 #, fuzzy, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1494
 #, c-format
 msgid "%s: keyblock read problem: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1579
+#: g10/trustdb.c:1508
 #, fuzzy, c-format
 msgid "%s: update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/trustdb.c:1582
+#: g10/trustdb.c:1511
 #, fuzzy, c-format
 msgid "%s: updated\n"
 msgstr "\\t%lu chiavi aggiornate\n"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1513
 #, c-format
 msgid "%s: okay\n"
 msgstr ""
 
-#: g10/trustdb.c:1599
+#: g10/trustdb.c:1528
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr ""
 
-#: g10/trustdb.c:1612
+#: g10/trustdb.c:1541
 #, fuzzy, c-format
 msgid "lid %lu: keyblock not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/trustdb.c:1621 g10/trustdb.c:1690
+#: g10/trustdb.c:1550 g10/trustdb.c:1623
 #, fuzzy, c-format
 msgid "lid %lu: update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/trustdb.c:1627 g10/trustdb.c:1696
+#: g10/trustdb.c:1556 g10/trustdb.c:1629
 #, fuzzy, c-format
 msgid "lid %lu: updated\n"
 msgstr "\\t%lu chiavi aggiornate\n"
 
-#: g10/trustdb.c:1631 g10/trustdb.c:1700
+#: g10/trustdb.c:1560 g10/trustdb.c:1633
 #, fuzzy, c-format
 msgid "lid %lu: okay\n"
 msgstr "lid %lu: manca la chiave primaria\n"
 
-#: g10/trustdb.c:1638 g10/trustdb.c:1706
+#: g10/trustdb.c:1567 g10/trustdb.c:1639
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu chiavi esaminate\n"
 
-#: g10/trustdb.c:1640
+#: g10/trustdb.c:1569
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\\t%lu chiavi saltate\n"
 
-#: g10/trustdb.c:1642 g10/trustdb.c:1708
+#: g10/trustdb.c:1571 g10/trustdb.c:1641
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\\t%lu chiavi con errori\n"
 
-#: g10/trustdb.c:1644 g10/trustdb.c:1710
+#: g10/trustdb.c:1573 g10/trustdb.c:1643
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\\t%lu chiavi aggiornate\n"
 
-#: g10/trustdb.c:1674
+#: g10/trustdb.c:1607
 #, fuzzy, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/trustdb.c:1679
+#: g10/trustdb.c:1612
 #, fuzzy, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/trustdb.c:1685
+#: g10/trustdb.c:1618
 #, fuzzy, c-format
 msgid "lid %lu: inserted\n"
 msgstr "\\t%lu chiavi inserite\n"
 
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1645
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\\t%lu chiavi inserite\n"
 
-#: g10/trustdb.c:1715
+#: g10/trustdb.c:1648
 #, fuzzy, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enum_secret_keys fallito: %s\n"
 
-#: g10/trustdb.c:1760
+#: g10/trustdb.c:1694
 #, fuzzy, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n"
 
-#: g10/trustdb.c:1767
+#: g10/trustdb.c:1701
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n"
 
-#: g10/trustdb.c:1771
+#: g10/trustdb.c:1705
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "chiave %08lX.%lu: inserita nel trustdb\n"
 
-#: g10/trustdb.c:1779
+#: g10/trustdb.c:1713
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "chiave %08lX.%lu: creata nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/trustdb.c:1786
+#: g10/trustdb.c:1720
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "chiave %08lX.%lu: scaduta il %s\n"
 
-#: g10/trustdb.c:1794
+#: g10/trustdb.c:1728
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "chiave %08lX.%lu: controllo della fiducia fallito: %s\n"
 
-#: g10/trustdb.c:2003 g10/trustdb.c:2032 g10/trustdb.c:2771
+#: g10/trustdb.c:1951 g10/trustdb.c:1981 g10/trustdb.c:2734
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr ""
 
-#: g10/trustdb.c:2054
+#: g10/trustdb.c:2003
 #, fuzzy, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/trustdb.c:2117
+#: g10/trustdb.c:2071
 #, fuzzy, c-format
 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"
 
-#: g10/trustdb.c:2121
+#: g10/trustdb.c:2075
 #, fuzzy, c-format
 msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n"
 msgstr "nota: rec di %lu[%d] nella hintlist di %lu ma  non marcato\n"
 
 #. we need the dir record
-#: g10/trustdb.c:2128
+#: g10/trustdb.c:2082
 #, c-format
 msgid "sig rec %lu[%d] in hintlist of %lu does not point to a dir record\n"
 msgstr "Il rec di %lu[%d] nella hintlist di %lu non punta a un record dir\n"
 
-#: g10/trustdb.c:2134
+#: g10/trustdb.c:2088
 #, c-format
 msgid "lid %lu: no primary key\n"
 msgstr "lid %lu: manca la chiave primaria\n"
 
-#: g10/trustdb.c:2167
+#: g10/trustdb.c:2121
 #, c-format
 msgid "lid %lu: user id not found in keyblock\n"
 msgstr "lid %lu: user id non trovato nel keyblock\n"
 
-#: g10/trustdb.c:2171
+#: g10/trustdb.c:2125
 #, c-format
 msgid "lid %lu: user id without signature\n"
 msgstr "chiave %08lX: user id senza firma\n"
 
-#: g10/trustdb.c:2178
+#: g10/trustdb.c:2132
 #, c-format
 msgid "lid %lu: self-signature in hintlist\n"
 msgstr "lid %lu: autofirma nella hintlist\n"
 
-#: g10/trustdb.c:2189 g10/trustdb.c:2910 g10/trustdb.c:2994
+#: g10/trustdb.c:2143 g10/trustdb.c:2879 g10/trustdb.c:2962
 msgid "Valid certificate revocation"
 msgstr "Revoca del certificato valida"
 
-#: g10/trustdb.c:2190 g10/trustdb.c:2911 g10/trustdb.c:2995
+#: g10/trustdb.c:2144 g10/trustdb.c:2880 g10/trustdb.c:2963
 msgid "Good certificate"
 msgstr "Certificato corretto"
 
-#: g10/trustdb.c:2199
+#: g10/trustdb.c:2153
 msgid "very strange: no public key\n"
 msgstr "molto strano: non ci sono chiavi pubbliche\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2201
 #, c-format
 msgid "hintlist %lu[%d] of %lu does not point to a dir record\n"
 msgstr "hintlist %lu[%d] di %lu non punta a un record dir\n"
 
-#: g10/trustdb.c:2253
+#: g10/trustdb.c:2207
 #, c-format
 msgid "lid %lu does not have a key\n"
 msgstr "Il lid %lu non ha una chiave\n"
 
-#: g10/trustdb.c:2263
+#: g10/trustdb.c:2217
 #, c-format
 msgid "lid %lu: can't get keyblock: %s\n"
 msgstr "lid %lu: impossibile ottenere il keyblock: %s\n"
 
-#: g10/trustdb.c:2320 g10/trustdb.c:3245
+#: g10/trustdb.c:2274 g10/trustdb.c:3227
 #, fuzzy, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/trustdb.c:2473
+#: g10/trustdb.c:2427
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "chiave %08lX.%lu: Legame con la subchiave corretto\n"
 
-#: g10/trustdb.c:2479 g10/trustdb.c:2521
+#: g10/trustdb.c:2433 g10/trustdb.c:2475
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "chiave %08lX.%lu: Legame con la subchiave non valido: %s\n"
 
-#: g10/trustdb.c:2494
+#: g10/trustdb.c:2448
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "chiave %08lX.%lu: Revoca della chiave valida\n"
 
-#: g10/trustdb.c:2500
+#: g10/trustdb.c:2454
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "chiave %08lX.%lu: Revoca della chiave non valida: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2469
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "chiave %08lX.%lu: Revoca della subchiave valida\n"
 
-#: g10/trustdb.c:2615
+#: g10/trustdb.c:2573
 msgid "Good self-signature"
 msgstr "Autofirma corretta"
 
-#: g10/trustdb.c:2626
+#: g10/trustdb.c:2584
 msgid "Invalid self-signature"
 msgstr "Autofirma non valida"
 
-#: g10/trustdb.c:2636
+#: g10/trustdb.c:2594
 msgid "Valid user ID revocation skipped due to a newer self signature\n"
 msgstr ""
 
-#: g10/trustdb.c:2643
+#: g10/trustdb.c:2601
 msgid "Valid user ID revocation\n"
 msgstr "Revoca dell'user ID valida\n"
 
-#: g10/trustdb.c:2650
+#: g10/trustdb.c:2608
 msgid "Invalid user ID revocation"
 msgstr "Revoca dell'user ID non valida"
 
-#: g10/trustdb.c:2734
+#: g10/trustdb.c:2697
 msgid "Too many preferences"
 msgstr "Troppe preferenze"
 
-#: g10/trustdb.c:2748
+#: g10/trustdb.c:2711
 #, fuzzy
 msgid "Too many preference items"
 msgstr "Troppi elementi di preferenza"
 
-#: g10/trustdb.c:2888
+#: g10/trustdb.c:2857
 #, fuzzy
 msgid "duplicated certificate - deleted"
 msgstr "Certificato doppio - cancellato"
 
-#: g10/trustdb.c:2922
+#: g10/trustdb.c:2891
 #, fuzzy
 msgid "Hmmm, public key lost?"
 msgstr "chiave pubblica perduta"
 
-#: g10/trustdb.c:2932 g10/trustdb.c:3015
+#: g10/trustdb.c:2900 g10/trustdb.c:2983
 msgid "Invalid certificate revocation"
 msgstr "Certificato di revoca non valido"
 
-#: g10/trustdb.c:2933 g10/trustdb.c:3016
+#: g10/trustdb.c:2901 g10/trustdb.c:2984
 msgid "Invalid certificate"
 msgstr "Certificato non valido"
 
-#: g10/trustdb.c:2948
+#: g10/trustdb.c:2916
 #, c-format
 msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n"
 msgstr ""
 
-#: g10/trustdb.c:2962
+#: g10/trustdb.c:2930
 #, fuzzy, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "Il rec di %lu[%d] nella hintlist di %lu non punta a un record dir\n"
 
 #. that should never happen
-#: g10/trustdb.c:3215
+#: g10/trustdb.c:3190
 #, fuzzy, c-format
 msgid "insert_trust_record: keyblock not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/trustdb.c:3233
+#: g10/trustdb.c:3215
 msgid "did not use primary key for insert_trust_record()\n"
 msgstr ""
 
-#: g10/ringedit.c:314
+#: g10/ringedit.c:316
 #, fuzzy, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: impossibile creare: %s\n"
 
-#: g10/ringedit.c:320 g10/ringedit.c:1315
+#: g10/ringedit.c:322 g10/ringedit.c:1330
 #, fuzzy, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: creato un nuovo file delle opzioni\n"
 
-#: g10/ringedit.c:1492
+#: g10/ringedit.c:1507
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/ringedit.c:1493
+#: g10/ringedit.c:1508
 #, fuzzy, c-format
 msgid "%s is the unchanged one\n"
 msgstr "chiavi segrete non cambiate %lu\n"
 
-#: g10/ringedit.c:1494
+#: g10/ringedit.c:1509
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/ringedit.c:1495
+#: g10/ringedit.c:1510
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
@@ -3065,12 +3082,12 @@ msgstr "Sovrascrivo (y/N)? "
 msgid "writing to stdout\n"
 msgstr "scrivo su stdout\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "presumo che i dati firmati siano in `%s'\n"
 
-#: g10/openfile.c:192
+#: g10/openfile.c:197
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: creato un nuovo file delle opzioni\n"
diff --git a/po/pl.po b/po/pl.po
index 11352ff72..4ed977cda 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-0.9.2\n"
-"POT-Creation-Date: 1999-02-19 15:31+0100\n"
+"POT-Creation-Date: 1999-03-08 19:50+0100\n"
 "PO-Revision-Date: 1999-01-26 01:30+01:00\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -22,15 +22,15 @@ msgstr ""
 "g10/seckey-cert.c g10/sig-check.c g10/sign\\.c g10/trustdb.c g10/verify.c "
 "g10/status.c g10/pubkey-enc.c\n"
 
-#: util/secmem.c:77
+#: util/secmem.c:76
 msgid "Warning: using insecure memory!\n"
 msgstr "Ostrze�enie: u�ywana pami�� nie jest pami�ci� bezpieczn�!\n"
 
-#: util/secmem.c:250
+#: util/secmem.c:249
 msgid "operation is not possible without initialized secure memory\n"
 msgstr ""
 
-#: util/secmem.c:251
+#: util/secmem.c:250
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
@@ -260,7 +260,7 @@ msgstr ""
 "JAKIEKOLWIEK DANE GENEROWANE PRZEZ TEN PROGRAM NIE NADAJ� SI� DO \n"
 "NORMALNEGO U�YTKU I NIE ZAPEWNIAJ� BEZPIECZE�STWA!!\n"
 
-#: cipher/rndlinux.c:118
+#: cipher/rndlinux.c:114
 #, c-format
 msgid ""
 "\n"
@@ -447,7 +447,10 @@ msgstr "mniej komunikat�ww"
 msgid "force v3 signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpis�w"
 
-#. { oDryRun, "dry-run",   0, N_("do not make any changes") },
+#: g10/g10.c:235
+msgid "do not make any changes"
+msgstr ""
+
 #: g10/g10.c:236
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: �adnych pyta�"
@@ -634,122 +637,122 @@ msgstr "plik opcji '%s': %s\n"
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z '%s'\n"
 
-#: g10/g10.c:796
+#: g10/g10.c:797
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/g10.c:836 g10/g10.c:848
+#: g10/g10.c:837 g10/g10.c:849
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:842 g10/g10.c:854
+#: g10/g10.c:843 g10/g10.c:855
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm geenracji skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/g10.c:857
+#: g10/g10.c:858
 #, 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:859
+#: g10/g10.c:860
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/g10.c:861
+#: g10/g10.c:862
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/g10.c:863
+#: g10/g10.c:864
 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:866
+#: g10/g10.c:867
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:870
+#: g10/g10.c:871
 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:947
+#: g10/g10.c:948
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/g10.c:953
+#: g10/g10.c:954
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:961
+#: g10/g10.c:962
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:969
+#: g10/g10.c:970
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:982
+#: g10/g10.c:983
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:995
+#: g10/g10.c:996
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:1009
+#: g10/g10.c:1010
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:1021
+#: g10/g10.c:1022
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:1030
+#: g10/g10.c:1031
 msgid "--edit-key username [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/g10.c:1046
+#: g10/g10.c:1047
 msgid "--delete-secret-key username"
 msgstr "--delete-secret-key nazwa u�ytkownika"
 
-#: g10/g10.c:1049
+#: g10/g10.c:1050
 msgid "--delete-key username"
 msgstr "--delete-key nazwa u�ytkownika"
 
-#: g10/encode.c:216 g10/g10.c:1072 g10/sign.c:311
+#: g10/encode.c:222 g10/g10.c:1073 g10/sign.c:311
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nie mog� otworzy� %s: %s\n"
 
-#: g10/g10.c:1083
+#: g10/g10.c:1084
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/g10.c:1144
+#: g10/g10.c:1145
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Usuni�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1152
+#: g10/g10.c:1153
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1219
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu '%s'\n"
 
-#: g10/g10.c:1297
+#: g10/g10.c:1298
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:1301
+#: g10/g10.c:1302
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1304 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1305 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mog� otworzy� '%s'\n"
@@ -829,7 +832,7 @@ msgstr ""
 "znak kodowania quoted-printable w opakowaniu ASCII - prawdopodobnie\n"
 "przek�amanie wprowadzone przez program transportowy poczty\n"
 
-#: g10/pkclist.c:138
+#: g10/pkclist.c:136
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -838,7 +841,7 @@ msgstr ""
 "Brak warto�ci zaufania dla %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:148
+#: g10/pkclist.c:146
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -861,28 +864,28 @@ msgstr ""
 " 4 = W pe�ni mu ufam.\n"
 " i = potrzebuj� wi�cej informacji\n"
 
-#: g10/pkclist.c:157
+#: g10/pkclist.c:155
 msgid " m = back to the main menu\n"
 msgstr " p = powr�t do g��wnego menu\n"
 
-#: g10/pkclist.c:159
+#: g10/pkclist.c:157
 msgid " q = quit\n"
 msgstr "w = wyj�cie\n"
 
 #. a string with valid answers
-#: g10/pkclist.c:164
+#: g10/pkclist.c:162
 msgid "sSmMqQ"
 msgstr "iIpPwW"
 
-#: g10/pkclist.c:168
+#: g10/pkclist.c:166
 msgid "Your decision? "
 msgstr "Twoja decyzja? "
 
-#: g10/pkclist.c:188
+#: g10/pkclist.c:186
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certyfikaty prowadz�ce do ostatecznie zaufanego klucza:\n"
 
-#: g10/pkclist.c:223
+#: g10/pkclist.c:221
 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"
@@ -892,7 +895,7 @@ msgstr ""
 "Sprawd�my czy mo�na przypisa� brakuj�ce warto�ci zaufania.\n"
 "\n"
 
-#: g10/pkclist.c:261
+#: g10/pkclist.c:260
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
@@ -900,7 +903,7 @@ msgstr ""
 "Brak �cie�ki prowadz�cej do kt�rego� z naszych kluczy.\n"
 "\n"
 
-#: g10/pkclist.c:263
+#: g10/pkclist.c:262
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
@@ -908,7 +911,7 @@ msgstr ""
 "Brak certyfikat�w o niezdefiniowanym poziomie zaufania.\n"
 "\n"
 
-#: g10/pkclist.c:265
+#: g10/pkclist.c:264
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -916,31 +919,31 @@ msgstr ""
 "Parametry zaufania nie zosta�y zmienione.\n"
 "\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:279
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "klucz %08lX: klucz zosta� uniewa�niony!\n"
 
-#: g10/pkclist.c:286 g10/pkclist.c:381
+#: g10/pkclist.c:285 g10/pkclist.c:397
 msgid "Use this key anyway? "
 msgstr "U�y� tego klucza pomimo to? "
 
-#: g10/pkclist.c:308
+#: g10/pkclist.c:309
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: data wa�no�ci klucza up�yn�a\n"
 
-#: g10/pkclist.c:314
+#: g10/pkclist.c:315
 #, 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:332
+#: g10/pkclist.c:333
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: OSTRZE�ENIE: Nie ufamy temu kluczowi!\n"
 
-#: g10/pkclist.c:338
+#: g10/pkclist.c:339
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -949,16 +952,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:344
+#: g10/pkclist.c:345
 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:349
+#: g10/pkclist.c:350
 msgid "This key belongs to us\n"
 msgstr "Ten klucz nale�y do nas\n"
 
-#: g10/pkclist.c:376
+#: g10/pkclist.c:392
 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"
@@ -969,58 +972,58 @@ 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:385
+#: g10/pkclist.c:405
 msgid "WARNING: Using untrusted key!\n"
 msgstr "OSTRZE�ENIE: u�ywany jest klucz nie obdarzony zaufaniem!\n"
 
-#: g10/pkclist.c:421
+#: g10/pkclist.c:441
 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:422
+#: g10/pkclist.c:442
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         To mo�e oznacza� �e podpis jest fa�szerstwem.\n"
 
-#: g10/pkclist.c:443
+#: g10/pkclist.c:463
 msgid "Note: This key has expired!\n"
 msgstr "Uwaga: Data wa�no�ci tego klucza up�yn�a!\n"
 
-#: g10/pkclist.c:450
+#: g10/pkclist.c:470
 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:452
+#: g10/pkclist.c:472
 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:468
+#: g10/pkclist.c:488
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "OSTRZE�ENIE: Nie ufamy temu kluczowi!\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:489
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Ten podpis prawdopodobnie jest FA�SZERSTWEM.\n"
 
-#: g10/pkclist.c:476
+#: g10/pkclist.c:496
 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:479
+#: g10/pkclist.c:499
 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:532 g10/pkclist.c:545 g10/pkclist.c:607 g10/pkclist.c:635
+#: g10/pkclist.c:552 g10/pkclist.c:565 g10/pkclist.c:628 g10/pkclist.c:656
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: pomini�ty: %s\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:574
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1028,20 +1031,20 @@ msgstr ""
 "Nie poda�e� identyfikatora u�ytkownika (user ID). \n"
 "Mo�na to zrobi� za pomoc� opcji \"-r\".\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:579
 msgid "Enter the user ID: "
 msgstr "Wprowad� identyfikator u�ytkownika (user ID): "
 
-#: g10/pkclist.c:570
+#: g10/pkclist.c:590
 msgid "No such user ID.\n"
 msgstr "Brak takiego identyfikatora u�ytkownika.\n"
 
-#: g10/pkclist.c:615
+#: g10/pkclist.c:636
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: b��d podczas sprawdzania klucza: %s\n"
 
-#: g10/pkclist.c:641
+#: g10/pkclist.c:662
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adres�w\n"
 
@@ -1192,7 +1195,7 @@ msgstr "Data wa�no�ci klucza: %s\n"
 msgid "Is this correct (y/n)? "
 msgstr "Dane poprawne (t/n)? "
 
-#: g10/keygen.c:582
+#: g10/keygen.c:583
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1208,23 +1211,23 @@ msgstr ""
 "    \"Tadeusz �ele�ski (Boy) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:593
+#: g10/keygen.c:594
 msgid "Real name: "
 msgstr "Imi� i nazwisko: "
 
-#: g10/keygen.c:597
+#: g10/keygen.c:598
 msgid "Invalid character in name\n"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:599
+#: g10/keygen.c:600
 msgid "Name may not start with a digit\n"
 msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:602
 msgid "Name must be at least 5 characters long\n"
 msgstr "Imi� i nazwisko musz� mie� conajmniej 5 znak�w d�ugo�ci.\n"
 
-#: g10/keygen.c:609
+#: g10/keygen.c:610
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
@@ -1240,7 +1243,12 @@ msgstr "Komentarz: "
 msgid "Invalid character in comment\n"
 msgstr "Niew�a�ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:655
+#: g10/keygen.c:657
+#, c-format
+msgid "You are using the `%s' character set.\n"
+msgstr ""
+
+#: g10/keygen.c:663
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1251,31 +1259,31 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:658
+#: g10/keygen.c:666
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:668
+#: g10/keygen.c:676
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, \n"
 "przej�� (D)alej czy (W)yj�� z programu ? "
 
-#: g10/keygen.c:720
+#: g10/keygen.c:728
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 "Musisz poda� wyra�enie przej�ciowe (has�o) aby ochroni� sw�j klucz tajny.\n"
 
-#: g10/keyedit.c:389 g10/keygen.c:728
+#: g10/keyedit.c:389 g10/keygen.c:736
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr ""
 "Powt�rzone wyra�enie przej�ciowe nie zgadza si� z podanym w pierwszej "
 "pr�bie;\n"
 "spr�buj jeszcze raz.\n"
 
-#: g10/keygen.c:734
+#: g10/keygen.c:742
 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"
@@ -1287,7 +1295,7 @@ msgstr ""
 "i opcji \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:755
+#: g10/keygen.c:763
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (work in another window, move the mouse, utilize the\n"
@@ -1302,33 +1310,33 @@ msgstr ""
 "entropii\n"
 "do zasilenia generatora liczb losowych.\n"
 
-#: g10/keygen.c:825
+#: g10/keygen.c:833
 msgid "Key generation can only be used in interactive mode\n"
 msgstr "Generacj� klucza mo�na wykonywa� tylko w trybie interaktywnym\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:841
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Para kluczy dla DSA b�dzie mia�a 1024 bity d�ugo�ci.\n"
 
-#: g10/keygen.c:839
+#: g10/keygen.c:847
 msgid "Key generation cancelled.\n"
 msgstr "Procedura generacji klucza zosta�a anulowana.\n"
 
-#: g10/keygen.c:849
+#: g10/keygen.c:857
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "zapisuj� certyfikat publiczny w '%s'\n"
 
-#: g10/keygen.c:850
+#: g10/keygen.c:858
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "zapisuj� certyfikat prywatny w '%s'\n"
 
-#: g10/keygen.c:927
+#: g10/keygen.c:935
 msgid "public and secret key created and signed.\n"
 msgstr "Prywatny i publiczny klucz zosta� stworzony i podpisany.\n"
 
-#: g10/keygen.c:929
+#: g10/keygen.c:937
 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"
@@ -1336,12 +1344,12 @@ msgstr ""
 "Ten klucz nie mo�e by� wykorzystany do szyfrowania. Komend� \"--edit-key\" \n"
 "mo�na doda� do niego podklucz u�ywany do szyfrowania.\n"
 
-#: g10/keygen.c:943 g10/keygen.c:1042
+#: g10/keygen.c:951 g10/keygen.c:1050
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:987 g10/sig-check.c:172 g10/sign.c:52
+#: g10/keygen.c:995 g10/sig-check.c:209 g10/sign.c:52
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1349,7 +1357,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:989 g10/sig-check.c:174 g10/sign.c:54
+#: g10/keygen.c:997 g10/sig-check.c:211 g10/sign.c:54
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1357,11 +1365,11 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:1028
 msgid "Really create? "
 msgstr "Na pewno generowa�? "
 
-#: g10/encode.c:88 g10/openfile.c:86 g10/openfile.c:169 g10/tdbio.c:467
+#: g10/encode.c:88 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
 #: g10/tdbio.c:527
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1372,17 +1380,17 @@ msgstr "%s: nie mog� otworzy�: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "b��d podczs tworzenia wyra�enia przej�ciowego (has�a): %s\n"
 
-#: g10/encode.c:155 g10/encode.c:269
+#: g10/encode.c:161 g10/encode.c:275
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: OSTRZE�ENIE: plik jest pusty\n"
 
-#: g10/encode.c:222
+#: g10/encode.c:228
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "odczyt z '%s'\n"
 
-#: g10/encode.c:397
+#: g10/encode.c:403
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s zaszyfrowany dla: %s\n"
@@ -1414,12 +1422,12 @@ msgstr "zbyt wiele wpis�w w buforze kluczy publicznych - wy��czony\n"
 msgid "too many entries in unk cache - disabled\n"
 msgstr "zbyt wiele wpis�w w buforze nieznanych kluczy - wy��czony\n"
 
-#: g10/getkey.c:1496 g10/getkey.c:1552
+#: g10/getkey.c:1502 g10/getkey.c:1558
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "u�ywany jest podklucz %08lX zamiast klucza g��wnego %08lX\n"
 
-#: g10/import.c:116 g10/trustdb.c:1318
+#: g10/import.c:116 g10/trustdb.c:1228
 #, c-format
 msgid "can't open file: %s\n"
 msgstr "nie mo�na otworzy� pliku: %s\n"
@@ -1429,12 +1437,12 @@ msgstr "nie mo�na otworzy� pliku: %s\n"
 msgid "skipping block of type %d\n"
 msgstr "pomijam blok typu %d\n"
 
-#: g10/import.c:167 g10/trustdb.c:1635 g10/trustdb.c:1704
+#: g10/import.c:167 g10/trustdb.c:1564 g10/trustdb.c:1637
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu kluczy przetworzonych do tej chwili\n"
 
-#: g10/import.c:172 g10/trustdb.c:1394
+#: g10/import.c:172 g10/trustdb.c:1304
 #, c-format
 msgid "read error: %s\n"
 msgstr "b��d odczytu: %s\n"
@@ -1517,7 +1525,7 @@ msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 msgid "no default public keyring\n"
 msgstr "brak domy�lnego zbioru kluczy publicznych\n"
 
-#: g10/import.c:374 g10/openfile.c:113 g10/sign.c:215 g10/sign.c:601
+#: g10/import.c:374 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:498
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
@@ -2093,43 +2101,47 @@ msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy tajnych\n"
 msgid "No user id with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1372
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Brak podklucza o indeksie %d\n"
 
-#: g10/mainproc.c:199
+#: g10/mainproc.c:202
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:202
+#. 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 conetxt.  do_proc_packets can then use
+#. * this list to display some information
+#: g10/mainproc.c:209
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "b��d odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:229
+#: g10/mainproc.c:236
 msgid "decryption okay\n"
 msgstr "odszyfrowane poprawnie\n"
 
-#: g10/mainproc.c:232
+#: g10/mainproc.c:239
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:249
+#: g10/mainproc.c:256
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana\n"
 
-#: g10/mainproc.c:251
+#: g10/mainproc.c:258
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:831
+#: g10/mainproc.c:839
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:837
+#: g10/mainproc.c:845
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
@@ -2137,29 +2149,29 @@ msgstr ""
 "z u�yciem klucza o identyfikatorze %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:863 g10/mainproc.c:874
+#: g10/mainproc.c:871 g10/mainproc.c:882
 msgid "BAD signature from \""
 msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
 
-#: g10/mainproc.c:864 g10/mainproc.c:875
+#: g10/mainproc.c:872 g10/mainproc.c:883
 msgid "Good signature from \""
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:866
+#: g10/mainproc.c:874
 #, fuzzy
 msgid "                aka \""
 msgstr "         do��czono do zbioru: %lu"
 
-#: g10/mainproc.c:908
+#: g10/mainproc.c:916
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mog� sprawdzi� podpisu: %s\n"
 
-#: g10/mainproc.c:981
+#: g10/mainproc.c:989
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:986
+#: g10/mainproc.c:994
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
@@ -2280,29 +2292,29 @@ msgstr ""
 "Ostrze�enie: Wykryto klucz s�aby algorytmu - nale�y ponownie zmieni� \n"
 "wyra�enie przej�ciowe (has�o).\n"
 
-#: g10/sig-check.c:155
+#: g10/sig-check.c:192
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "Klucz algorytmu ElGamala wygenerowany przez PGP - podpisy nim sk�adane\n"
 "nie zapewniaj� bezpiecze�stwa!\n"
 
-#: g10/sig-check.c:163
+#: g10/sig-check.c:200
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "klucz publiczny jest o %lu sekund m�odszy od podpisu\n"
 
-#: g10/sig-check.c:164
+#: g10/sig-check.c:201
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "klucz publiczny jest o %lu sekund m�odszy od podpisu\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:217
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "UWAGA: klucz podpisuj�cy przekroczy� dat� wa�no�ci %s\n"
 
-#: g10/sig-check.c:237
+#: g10/sig-check.c:274
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "przyj�to niewa�no�� podpisu z powonu ustawienia nieznanego bitu krytycznego\n"
@@ -2312,7 +2324,7 @@ msgstr ""
 msgid "%s signature from: %s\n"
 msgstr "%s podpis z�o�ony przez: %s\n"
 
-#: g10/sign.c:210 g10/sign.c:596
+#: g10/sign.c:210 g10/sign.c:493
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "nie mog� stworzy� %s: %s\n"
@@ -2326,11 +2338,16 @@ msgstr "podpis:"
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "OSTRZE�ENIE: plik '%s' jest pusty\n"
 
-#: g10/textfilter.c:199
+#: g10/textfilter.c:122
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "nie mog� obs�u�y� linii tekstu d�u�szej ni� %d znak�w\n"
 
+#: g10/textfilter.c:189
+#, fuzzy, c-format
+msgid "input line longer than %d characters\n"
+msgstr "b��d opakowania: linia d�u�sza ni� %d znak�w\n"
+
 #: g10/tdbio.c:117 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
@@ -2350,12 +2367,12 @@ msgstr "zbyt du�e zlecenie dla bazy zaufania\n"
 msgid "%s: can't access: %s\n"
 msgstr "%s: dost�p niemo�liwy: %s\n"
 
-#: g10/ringedit.c:294 g10/tdbio.c:444
+#: g10/ringedit.c:296 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: nie mog� utworzy� katalogu: %s\n"
 
-#: g10/ringedit.c:300 g10/tdbio.c:447
+#: g10/ringedit.c:302 g10/tdbio.c:447
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: katalog utworzony\n"
@@ -2365,7 +2382,7 @@ msgstr "%s: katalog utworzony\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalog nie istnieje!\n"
 
-#: g10/openfile.c:109 g10/openfile.c:176 g10/ringedit.c:1310 g10/tdbio.c:457
+#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1325 g10/tdbio.c:457
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: nie mog� utworzy�: %s\n"
@@ -2461,166 +2478,166 @@ msgstr "%s: zerowanie rekordu nie powiod�o si�: %s\n"
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: dopisanie rekordu nie powiod�o si�: %s\n"
 
-#: g10/trustdb.c:144
+#: g10/trustdb.c:165
 msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
 msgstr ""
 "Baza zaufania jest uszkodzona; prosz� uruchomi� \"gpgm --fix-trust-db\".\n"
 
-#: g10/trustdb.c:157
+#: g10/trustdb.c:178
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: odczyt nie powi�d� si�: %s\n"
 
-#: g10/trustdb.c:172
+#: g10/trustdb.c:193
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: zapis nie powi�d� si�: %s\n"
 
-#: g10/trustdb.c:186
+#: g10/trustdb.c:207
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "wpis zaufania %lu: usuni�cie nie powiod�o si� %s\n"
 
-#: g10/trustdb.c:200
+#: g10/trustdb.c:221
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "baza zaufania: synchronizacja nie powiod�a si� %s\n"
 
-#: g10/trustdb.c:329
+#: g10/trustdb.c:351
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "b��d odczytu wpisu katalogowego dla LID %lu: %s\n"
 
-#: g10/trustdb.c:336
+#: g10/trustdb.c:358
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: oczekiwany wpis katalogowy, napotkano typ %d\n"
 
-#: g10/trustdb.c:341
+#: g10/trustdb.c:363
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "brak klucza g��wnego dla LID %lu\n"
 
-#: g10/trustdb.c:346
+#: g10/trustdb.c:368
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "b��d odczytu g��wnego klucza dla LID %lu: %s\n"
 
-#: g10/trustdb.c:422
+#: g10/trustdb.c:445
 #, c-format
 msgid "chained sigrec %lu has a wrong owner\n"
 msgstr "powi�zany rekord podpisu %lu ma niew�a�ciwego w�a�ciciela\n"
 
-#: g10/trustdb.c:465
+#: g10/trustdb.c:488
 #, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "'%s\" nie jest w�a�ciwym identyfikatorem klucza\n"
 
-#: g10/trustdb.c:500
+#: g10/trustdb.c:523
 #, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr ""
 "klucz %08lX: brak klucza publicznego dla klucza zaufanego - pomini�ty\n"
 
-#: g10/trustdb.c:509 g10/trustdb.c:567
+#: g10/trustdb.c:532 g10/trustdb.c:590
 #, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "klucz %08lX: wpisanie do bazy zaufania niemo�liwe\n"
 
-#: g10/trustdb.c:514 g10/trustdb.c:573
+#: g10/trustdb.c:537 g10/trustdb.c:596
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "klucz %08lX: wyszukanie zapisu nie powiod�o si�\n"
 
-#: g10/trustdb.c:519 g10/trustdb.c:582
+#: g10/trustdb.c:542 g10/trustdb.c:605
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "klucz %08lX: ju� znajduje si� w tablicy kluczy zaufanych\n"
 
-#: g10/trustdb.c:522 g10/trustdb.c:585
+#: g10/trustdb.c:545 g10/trustdb.c:608
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "Klucz %08lX: zaakceptowany jako klucz zaufany.\n"
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:561
 #, c-format
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "UWAGA: klucz tajny %08lX NIE jest chroniony.\n"
 
-#: g10/trustdb.c:550
+#: g10/trustdb.c:573
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pomini�ty\n"
 
-#: g10/trustdb.c:557
+#: g10/trustdb.c:580
 #, c-format
 msgid "key %08lX: secret and public key don't match\n"
 msgstr "klucz %08lX: klucz tajny nie pasuje do klucza jawnego\n"
 
-#: g10/trustdb.c:593
+#: g10/trustdb.c:616
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "wyliczenie kluczy tajnych nie powiod�o si� %s\n"
 
-#: g10/trustdb.c:776
+#: g10/trustdb.c:770
 #, c-format
 msgid "lid %lu: read dir record failed: %s\n"
 msgstr "lid %lu: odczyt wpisu katalogowego nie powi�d� si�: %s\n"
 
-#: g10/trustdb.c:785
+#: g10/trustdb.c:779
 #, c-format
 msgid "lid %lu: read key record failed: %s\n"
 msgstr "lid %lu: odczyt wpisu klucza nie powi�d� si�: %s\n"
 
-#: g10/trustdb.c:795
+#: g10/trustdb.c:789
 #, c-format
 msgid "lid %lu: read uid record failed: %s\n"
 msgstr "lid %lu: odczyt wpisu z identyfikatorem nie powi�d� si�; %s\n"
 
-#: g10/trustdb.c:804
+#: g10/trustdb.c:798
 #, c-format
 msgid "lid %lu: read pref record failed: %s\n"
 msgstr "lid %lu: odczyt wpisu ustawie� nie powi�d� si�: %s\n"
 
-#: g10/trustdb.c:814
+#: g10/trustdb.c:808
 #, c-format
 msgid "lid %lu: read sig record failed: %s\n"
 msgstr "lid %lu: odczyt wpisu o podpisach nie powi�d� si�: %s\n"
 
-#: g10/trustdb.c:1151
+#: g10/trustdb.c:1037
 msgid "Ooops, no keys\n"
 msgstr "Oops, brak kluczy\n"
 
-#: g10/trustdb.c:1155
+#: g10/trustdb.c:1041
 msgid "Ooops, no user ids\n"
 msgstr "Oops, brak identyfikator�w u�ytkownik�w\n"
 
-#: g10/trustdb.c:1226 g10/trustdb.c:1244
+#: g10/trustdb.c:1134 g10/trustdb.c:1152
 #, c-format
 msgid "user '%s' read problem: %s\n"
 msgstr "u�ytkownik '%s' b��d przy odczycie: %s\n"
 
-#: g10/trustdb.c:1229 g10/trustdb.c:1247
+#: g10/trustdb.c:1137 g10/trustdb.c:1155
 #, c-format
 msgid "user '%s' list problem: %s\n"
 msgstr "u�ytkownik '%s' b��d listy: %s\n"
 
-#: g10/trustdb.c:1237 g10/trustdb.c:1485
+#: g10/trustdb.c:1145 g10/trustdb.c:1447
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "u�ytkownik '%s' nie odnaleziony: %s\n"
 
-#: g10/trustdb.c:1239 g10/trustdb.c:1487
+#: g10/trustdb.c:1147 g10/trustdb.c:1449
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problem podczas szukania '%s' w bazie zaufania: %s\n"
 
-#: g10/trustdb.c:1242
+#: g10/trustdb.c:1150
 #, c-format
 msgid "user '%s' not in trustdb\n"
 msgstr "brak u�ytkownika '%s' w bazie zaufania\n"
 
-#: g10/trustdb.c:1277
+#: g10/trustdb.c:1186
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -2629,205 +2646,205 @@ msgstr ""
 "# Lista przypisanych warto�ci zaufania, stworzona %s\n"
 "# (u�yj \"gpgm --import-ownertrust\" aby j� przywr�ci�)\n"
 
-#: g10/trustdb.c:1283
+#: g10/trustdb.c:1192
 msgid "directory record w/o primary key\n"
 msgstr "wpis katalogowy bez klucza g��wnego\n"
 
-#: g10/trustdb.c:1290
+#: g10/trustdb.c:1199
 #, c-format
 msgid "error reading key record: %s\n"
 msgstr "b��d odczytu rekordu podpisu: %s\n"
 
-#: g10/trustdb.c:1330
+#: g10/trustdb.c:1240
 msgid "line too long\n"
 msgstr "linia za d�uga\n"
 
-#: g10/trustdb.c:1338
+#: g10/trustdb.c:1248
 msgid "error: missing colon\n"
 msgstr "b��d: brak dwukropka\n"
 
-#: g10/trustdb.c:1343
+#: g10/trustdb.c:1253
 msgid "error: invalid fingerprint\n"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: g10/trustdb.c:1347
+#: g10/trustdb.c:1257
 msgid "error: no ownertrust value\n"
 msgstr "b��d: brak warto��i zaufania w�a�ciciela\n"
 
-#: g10/trustdb.c:1372
+#: g10/trustdb.c:1282
 msgid "key not in trustdb, searching ring.\n"
 msgstr "brak klucza w bazie zaufania, przeszukiwany jest zbi�r kluczy\n"
 
-#: g10/trustdb.c:1375
+#: g10/trustdb.c:1285
 #, c-format
 msgid "key not in ring: %s\n"
 msgstr "klucza nie ma w zbiorze: %s\n"
 
-#: g10/trustdb.c:1379
+#: g10/trustdb.c:1289
 msgid "Oops: key is now in trustdb???\n"
 msgstr "Oops: klucz ju� jest w bazie zaufania???\n"
 
 #. update the ownertrust
-#: g10/trustdb.c:1384
+#: g10/trustdb.c:1294
 #, c-format
 msgid "insert trust record failed: %s\n"
 msgstr "wstawienie wpisu zaufania nie powiod�o si�: %s\n"
 
 #. error
-#: g10/trustdb.c:1390
+#: g10/trustdb.c:1300
 #, c-format
 msgid "error finding dir record: %s\n"
 msgstr "b��d podczas poszukiwania wpisu katalogowego: %s\n"
 
-#: g10/trustdb.c:1490
+#: g10/trustdb.c:1452
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "brak u�ytkownika '%s' w bazie zaufania - dodano\n"
 
-#: g10/trustdb.c:1493
+#: g10/trustdb.c:1455
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "umieszczenie '%s' w Bazie Zaufania nie powiod�o si�: %s\n"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1494
 #, c-format
 msgid "%s: keyblock read problem: %s\n"
 msgstr "%s: problem przy odczycie bloku klucza: %s\n"
 
-#: g10/trustdb.c:1579
+#: g10/trustdb.c:1508
 #, c-format
 msgid "%s: update failed: %s\n"
 msgstr "%s: zapis zmian nie powiod� si�: %s\n"
 
-#: g10/trustdb.c:1582
+#: g10/trustdb.c:1511
 #, c-format
 msgid "%s: updated\n"
 msgstr "%s: uaktualniony\n"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1513
 #, c-format
 msgid "%s: okay\n"
 msgstr "%s: OK\n"
 
-#: g10/trustdb.c:1599
+#: g10/trustdb.c:1528
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: wpis katalogowy bez bloku klucza - pomini�ty\n"
 
-#: g10/trustdb.c:1612
+#: g10/trustdb.c:1541
 #, c-format
 msgid "lid %lu: keyblock not found: %s\n"
 msgstr "lid %lu: blok klucza nie zosta� odnaleziony: %s\n"
 
-#: g10/trustdb.c:1621 g10/trustdb.c:1690
+#: g10/trustdb.c:1550 g10/trustdb.c:1623
 #, c-format
 msgid "lid %lu: update failed: %s\n"
 msgstr "lid %lu: naniesienie poprawek nie powiod�o si�: %s\n"
 
-#: g10/trustdb.c:1627 g10/trustdb.c:1696
+#: g10/trustdb.c:1556 g10/trustdb.c:1629
 #, c-format
 msgid "lid %lu: updated\n"
 msgstr "lid %lu: uaktualniony\n"
 
-#: g10/trustdb.c:1631 g10/trustdb.c:1700
+#: g10/trustdb.c:1560 g10/trustdb.c:1633
 #, c-format
 msgid "lid %lu: okay\n"
 msgstr "lid %lu: OK\n"
 
-#: g10/trustdb.c:1638 g10/trustdb.c:1706
+#: g10/trustdb.c:1567 g10/trustdb.c:1639
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu kluczy przetworzonych\n"
 
-#: g10/trustdb.c:1640
+#: g10/trustdb.c:1569
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu kluczy pomini�tych\n"
 
-#: g10/trustdb.c:1642 g10/trustdb.c:1708
+#: g10/trustdb.c:1571 g10/trustdb.c:1641
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu kluczy z b��dami\n"
 
-#: g10/trustdb.c:1644 g10/trustdb.c:1710
+#: g10/trustdb.c:1573 g10/trustdb.c:1643
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu kluczy uaktualnionych\n"
 
-#: g10/trustdb.c:1674
+#: g10/trustdb.c:1607
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: wpisanie nie powiod�o si�: %s\n"
 
-#: g10/trustdb.c:1679
+#: g10/trustdb.c:1612
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: wpisanie nie powiod�o si�: %s\n"
 
-#: g10/trustdb.c:1685
+#: g10/trustdb.c:1618
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: wpisany\n"
 
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1645
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "        %lu kluczy wpisanych\n"
 
-#: g10/trustdb.c:1715
+#: g10/trustdb.c:1648
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "wyliczenie blok�w kluczy nie powiod�o si�: %s\n"
 
-#: g10/trustdb.c:1760
+#: g10/trustdb.c:1694
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: poszukiwanie wpisu katalogowego nie powiod�o si�: %s\n"
 
-#: g10/trustdb.c:1767
+#: g10/trustdb.c:1701
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "klucz %08lX: wprowadzenie wpisu zaufania nie powiod�o si�: %s\n"
 
-#: g10/trustdb.c:1771
+#: g10/trustdb.c:1705
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "Klucz %08lX.%lu: wprowadzony do bazy zaufania\n"
 
-#: g10/trustdb.c:1779
+#: g10/trustdb.c:1713
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "Klucz %08lX.%lu: stworzony w przysz�o�ci (zaburzenia czasoprzestrzeni,\n"
 "lub �le ustawiony zegar systemowy)\n"
 
-#: g10/trustdb.c:1786
+#: g10/trustdb.c:1720
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "klucz %08lX.%lu: okres wa�no�ci up�yn�� %s\n"
 
-#: g10/trustdb.c:1794
+#: g10/trustdb.c:1728
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "klucz %08lX.%lu: b��d przy sprawdzaniu zaufania: %s\n"
 
-#: g10/trustdb.c:2003 g10/trustdb.c:2032 g10/trustdb.c:2771
+#: g10/trustdb.c:1951 g10/trustdb.c:1981 g10/trustdb.c:2734
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "OSTRZE�ENIE: d�ugie wpisy ustawie� jeszcze nie s� obs�ugiwane.\n"
 
-#: g10/trustdb.c:2054
+#: g10/trustdb.c:2003
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: funkcja search_record zawiod�a: %s\n"
 
-#: g10/trustdb.c:2117
+#: g10/trustdb.c:2071
 #, c-format
 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"
 "ale jest zaznaczony jako sprawdzony.\n"
 
-#: g10/trustdb.c:2121
+#: g10/trustdb.c:2075
 #, c-format
 msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n"
 msgstr ""
@@ -2835,185 +2852,185 @@ msgstr ""
 "ale nie jest zaznaczony.\n"
 
 #. we need the dir record
-#: g10/trustdb.c:2128
+#: g10/trustdb.c:2082
 #, c-format
 msgid "sig rec %lu[%d] in hintlist of %lu does not point to a dir record\n"
 msgstr ""
 "wpis oi podpisie %lu[%d] w li�cie domy�lnej %lu nie wskazuje \n"
 "na wpis katalogowy\n"
 
-#: g10/trustdb.c:2134
+#: g10/trustdb.c:2088
 #, c-format
 msgid "lid %lu: no primary key\n"
 msgstr "lid %lu: brak klucza g��wnego\n"
 
-#: g10/trustdb.c:2167
+#: g10/trustdb.c:2121
 #, c-format
 msgid "lid %lu: user id not found in keyblock\n"
 msgstr ""
 "lid %lu: identyfikator u�ytkownika nie zosta� odnaleziony w bloku klucza\n"
 
-#: g10/trustdb.c:2171
+#: g10/trustdb.c:2125
 #, c-format
 msgid "lid %lu: user id without signature\n"
 msgstr "lid %lu: niepodpisany identyfikator u�ytkownika\n"
 
-#: g10/trustdb.c:2178
+#: g10/trustdb.c:2132
 #, c-format
 msgid "lid %lu: self-signature in hintlist\n"
 msgstr "lid %lu: podpis klucza nim samym w li�cie domy�lnej\n"
 
-#: g10/trustdb.c:2189 g10/trustdb.c:2910 g10/trustdb.c:2994
+#: g10/trustdb.c:2143 g10/trustdb.c:2879 g10/trustdb.c:2962
 msgid "Valid certificate revocation"
 msgstr "Poprawne uniewa�nienie certyfikatu"
 
-#: g10/trustdb.c:2190 g10/trustdb.c:2911 g10/trustdb.c:2995
+#: g10/trustdb.c:2144 g10/trustdb.c:2880 g10/trustdb.c:2963
 msgid "Good certificate"
 msgstr "Poprawny certyfikat"
 
-#: g10/trustdb.c:2199
+#: g10/trustdb.c:2153
 msgid "very strange: no public key\n"
 msgstr "bardzo dziwne: brak klucza publicznego\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2201
 #, c-format
 msgid "hintlist %lu[%d] of %lu does not point to a dir record\n"
 msgstr "lista domy�lna %lu[%d] z %lu nie wskazuje na wpis katalogowy\n"
 
-#: g10/trustdb.c:2253
+#: g10/trustdb.c:2207
 #, c-format
 msgid "lid %lu does not have a key\n"
 msgstr "lid %lu nie ma klucza\n"
 
-#: g10/trustdb.c:2263
+#: g10/trustdb.c:2217
 #, c-format
 msgid "lid %lu: can't get keyblock: %s\n"
 msgstr "lid %lu: pobranie bloku klucza niemo�liwe: %s\n"
 
-#: g10/trustdb.c:2320 g10/trustdb.c:3245
+#: g10/trustdb.c:2274 g10/trustdb.c:3227
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "Procedura tdbio_search_dir nie powiod�a si�: %s\n"
 
-#: g10/trustdb.c:2473
+#: g10/trustdb.c:2427
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "klucz %08lX.%lu Dobre dowi�zanie podklucza\n"
 
-#: g10/trustdb.c:2479 g10/trustdb.c:2521
+#: g10/trustdb.c:2433 g10/trustdb.c:2475
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "klucz %08lX.%lu: Niepoprawne dowi�zanie podklucza %s\n"
 
-#: g10/trustdb.c:2494
+#: g10/trustdb.c:2448
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "klucz %08lX.%lu: Poprawne uniewa�nienie klucza\n"
 
-#: g10/trustdb.c:2500
+#: g10/trustdb.c:2454
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "klucz %08lX.%lu: Niew�a�ciwe uniewa�nienie klucza: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2469
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "klucz %08lX.%lu: Poprawne uniewa�nienie podklucza\n"
 
-#: g10/trustdb.c:2615
+#: g10/trustdb.c:2573
 msgid "Good self-signature"
 msgstr "Poprawny podpis klucza nim samym"
 
-#: g10/trustdb.c:2626
+#: g10/trustdb.c:2584
 msgid "Invalid self-signature"
 msgstr "Niepoprawny podpis klucza nim samym"
 
-#: g10/trustdb.c:2636
+#: g10/trustdb.c:2594
 msgid "Valid user ID revocation skipped due to a newer self signature\n"
 msgstr ""
 "Poprawne uniewa�nienie identyfikatora u�ytkownika pomini�te z powodu \n"
 "nowszego podpisu tym samym kluczem\n"
 
-#: g10/trustdb.c:2643
+#: g10/trustdb.c:2601
 msgid "Valid user ID revocation\n"
 msgstr "Poprawne uniewa�nienie identyfikatora u�ytkownika\n"
 
-#: g10/trustdb.c:2650
+#: g10/trustdb.c:2608
 msgid "Invalid user ID revocation"
 msgstr "Niepoprawne uniewa�nienie identyfikatora u�ytkownika"
 
-#: g10/trustdb.c:2734
+#: g10/trustdb.c:2697
 msgid "Too many preferences"
 msgstr "Zbyt wiele ustawie�."
 
-#: g10/trustdb.c:2748
+#: g10/trustdb.c:2711
 msgid "Too many preference items"
 msgstr "Zbyt wiele pozycji w ustawieniach"
 
-#: g10/trustdb.c:2888
+#: g10/trustdb.c:2857
 #, fuzzy
 msgid "duplicated certificate - deleted"
 msgstr "Podw�jna kopia certyfikatu - usuni�ta"
 
-#: g10/trustdb.c:2922
+#: g10/trustdb.c:2891
 msgid "Hmmm, public key lost?"
 msgstr "Hmmm, klucz publiczny starcony?"
 
-#: g10/trustdb.c:2932 g10/trustdb.c:3015
+#: g10/trustdb.c:2900 g10/trustdb.c:2983
 msgid "Invalid certificate revocation"
 msgstr "Niepoprawne uniewa�nienie certyfikatu"
 
-#: g10/trustdb.c:2933 g10/trustdb.c:3016
+#: g10/trustdb.c:2901 g10/trustdb.c:2984
 msgid "Invalid certificate"
 msgstr "Niepoprawny certyfikat"
 
-#: g10/trustdb.c:2948
+#: g10/trustdb.c:2916
 #, c-format
 msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n"
 msgstr ""
 "identyfikator %08lX.%lu/%02X%02X: ma zdublowany katalog %lu,\n"
 "ale nie jest jeszcze zaznaczony.\n"
 
-#: g10/trustdb.c:2962
+#: g10/trustdb.c:2930
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "zapis o podpisach %lu[%d] wskazuje na z�y wpis.\n"
 
 #. that should never happen
-#: g10/trustdb.c:3215
+#: g10/trustdb.c:3190
 #, c-format
 msgid "insert_trust_record: keyblock not found: %s\n"
 msgstr "insert_trust_record: brak bloku klucza: %s\n"
 
-#: g10/trustdb.c:3233
+#: g10/trustdb.c:3215
 msgid "did not use primary key for insert_trust_record()\n"
 msgstr "g�owny klucz nie zosta� u�yty w procedurze insert_trust_record()\n"
 
-#: g10/ringedit.c:314
+#: g10/ringedit.c:316
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: stworzenie zbioru kluczy jest niemo�liwe: %s\n"
 
-#: g10/ringedit.c:320 g10/ringedit.c:1315
+#: g10/ringedit.c:322 g10/ringedit.c:1330
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: zbi�r kluczy utworzony\n"
 
-#: g10/ringedit.c:1492
+#: g10/ringedit.c:1507
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "OSTRZE�ENIE: Istniej� dwa pliki z poufnymi informacjami.\n"
 
-#: g10/ringedit.c:1493
+#: g10/ringedit.c:1508
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s pozosta� bez zmian\n"
 
-#: g10/ringedit.c:1494
+#: g10/ringedit.c:1509
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s zosta� utworzony\n"
 
-#: g10/ringedit.c:1495
+#: g10/ringedit.c:1510
 msgid "Please fix this possible security flaw\n"
 msgstr "Prosz� usun�� to naruszenie zasad bezpiecze�stwa\n"
 
@@ -3051,12 +3068,12 @@ msgstr "Nadpisa� (t/N)? "
 msgid "writing to stdout\n"
 msgstr "zapisywanie na wyj�cie standardowe\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "przyj�to obecno�� podpisanych danych w '%s'\n"
 
-#: g10/openfile.c:192
+#: g10/openfile.c:197
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: stworzono nowy plik ustawie�\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 36486555c..08e8c240d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-02-19 15:31+0100\n"
+"POT-Creation-Date: 1999-03-08 19:50+0100\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-20 23:46:36-0200\n"
 "From: Thiago Jung Bauermann <[email protected]>\n"
@@ -16,15 +16,15 @@ msgstr ""
 "g10/mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c "
 "g10/sig-check.c g10/sign.c g10/trustdb.c g10/verify.c\n"
 
-#: util/secmem.c:77
+#: util/secmem.c:76
 msgid "Warning: using insecure memory!\n"
 msgstr "Aviso: usando mem�ria insegura!\n"
 
-#: util/secmem.c:250
+#: util/secmem.c:249
 msgid "operation is not possible without initialized secure memory\n"
 msgstr ""
 
-#: util/secmem.c:251
+#: util/secmem.c:250
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
@@ -299,7 +299,7 @@ msgstr ""
 "N�O USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:118
+#: cipher/rndlinux.c:114
 #, c-format
 msgid ""
 "\n"
@@ -486,7 +486,10 @@ msgstr "ser mais silencioso"
 msgid "force v3 signatures"
 msgstr "for�a assinaturas v3"
 
-#. { oDryRun, "dry-run",   0, N_("do not make any changes") },
+#: g10/g10.c:235
+msgid "do not make any changes"
+msgstr ""
+
 #: g10/g10.c:236
 msgid "batch mode: never ask"
 msgstr "processo de lote: nunca perguntar"
@@ -677,122 +680,122 @@ msgstr "arquivo de op��es `%s': %s\n"
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/g10.c:796
+#: g10/g10.c:797
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s n�o � um mapa de caracteres v�lido\n"
 
-#: g10/g10.c:836 g10/g10.c:848
+#: g10/g10.c:837 g10/g10.c:849
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:842 g10/g10.c:854
+#: g10/g10.c:843 g10/g10.c:855
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:857
+#: g10/g10.c:858
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "algoritmo de compress�o deve estar na faixa %d..%d\n"
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:861
+#: g10/g10.c:862
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:863
+#: g10/g10.c:864
 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:866
+#: g10/g10.c:867
 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:870
+#: g10/g10.c:871
 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:947
+#: g10/g10.c:948
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confian�a: %s\n"
 
-#: g10/g10.c:953
+#: g10/g10.c:954
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:961
+#: g10/g10.c:962
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:969
+#: g10/g10.c:970
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:982
+#: g10/g10.c:983
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:995
+#: g10/g10.c:996
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1009
+#: g10/g10.c:1010
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1022
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1030
+#: g10/g10.c:1031
 msgid "--edit-key username [commands]"
 msgstr "--edit-key nome_do_usu�rio [comandos]"
 
-#: g10/g10.c:1046
+#: g10/g10.c:1047
 msgid "--delete-secret-key username"
 msgstr "--delete-secret-key nome_do_usu�rio"
 
-#: g10/g10.c:1049
+#: g10/g10.c:1050
 msgid "--delete-key username"
 msgstr "--delete-key nome_do_usu�rio"
 
-#: g10/encode.c:216 g10/g10.c:1072 g10/sign.c:311
+#: g10/encode.c:222 g10/g10.c:1073 g10/sign.c:311
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:1083
+#: g10/g10.c:1084
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [id_do_usu�rio] [anel_de_chaves]"
 
-#: g10/g10.c:1144
+#: g10/g10.c:1145
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1152
+#: g10/g10.c:1153
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1219
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribui��o inv�lido `%s'\n"
 
-#: g10/g10.c:1297
+#: g10/g10.c:1298
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:1301
+#: g10/g10.c:1302
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1304 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1305 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
@@ -873,7 +876,7 @@ msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 
-#: g10/pkclist.c:138
+#: g10/pkclist.c:136
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -882,7 +885,7 @@ msgstr ""
 "Nenhum valor de confian�a designado para %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:148
+#: g10/pkclist.c:146
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -905,29 +908,29 @@ msgstr ""
 " 4 = Eu confio completamente\n"
 " 5 = Mostrar mais informa��o\n"
 
-#: g10/pkclist.c:157
+#: g10/pkclist.c:155
 msgid " m = back to the main menu\n"
 msgstr " m = volta ao menu principal\n"
 
-#: g10/pkclist.c:159
+#: g10/pkclist.c:157
 msgid " q = quit\n"
 msgstr ""
 
 #. a string with valid answers
-#: g10/pkclist.c:164
+#: g10/pkclist.c:162
 #, fuzzy
 msgid "sSmMqQ"
 msgstr "iImMqQ"
 
-#: g10/pkclist.c:168
+#: g10/pkclist.c:166
 msgid "Your decision? "
 msgstr "Sua decis�o? "
 
-#: g10/pkclist.c:188
+#: g10/pkclist.c:186
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/pkclist.c:223
+#: g10/pkclist.c:221
 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"
@@ -937,13 +940,13 @@ msgstr ""
 "Vamos ver se � poss�vel designar alguns valores de confian�a perdidos.\n"
 "\n"
 
-#: g10/pkclist.c:261
+#: g10/pkclist.c:260
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
 msgstr "Nenhuma rota que leva a uma de nossas chaves encontrada.\n"
 
-#: g10/pkclist.c:263
+#: g10/pkclist.c:262
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
@@ -951,7 +954,7 @@ msgstr ""
 "Nenhum certificado com confian�a indefinida encontrado.\n"
 "\n"
 
-#: g10/pkclist.c:265
+#: g10/pkclist.c:264
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -959,31 +962,31 @@ msgstr ""
 "Nenhum valor de confian�a modificado.\n"
 "\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:279
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "chave %08lX: a chave foi revogada!\n"
 
-#: g10/pkclist.c:286 g10/pkclist.c:381
+#: g10/pkclist.c:285 g10/pkclist.c:397
 msgid "Use this key anyway? "
 msgstr "Usa esta chave de qualquer modo?"
 
-#: g10/pkclist.c:308
+#: g10/pkclist.c:309
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: a chave expirou\n"
 
-#: g10/pkclist.c:314
+#: g10/pkclist.c:315
 #, 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:332
+#: g10/pkclist.c:333
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: N�s N�O confiamos nesta chave\n"
 
-#: g10/pkclist.c:338
+#: g10/pkclist.c:339
 #, fuzzy, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -992,15 +995,15 @@ msgstr ""
 "%08lX: N�o se tem certeza de que esta chave realmente pertence ao dono\n"
 "mas � aceitada de qualquer modo\n"
 
-#: g10/pkclist.c:344
+#: g10/pkclist.c:345
 msgid "This key probably belongs to the owner\n"
 msgstr "Esta chave provavelmente pertence ao dono\n"
 
-#: g10/pkclist.c:349
+#: g10/pkclist.c:350
 msgid "This key belongs to us\n"
 msgstr "Esta chave pertence a n�s (n�s temos a chave secreta)\n"
 
-#: g10/pkclist.c:376
+#: g10/pkclist.c:392
 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,54 +1015,54 @@ msgstr ""
 "afirmativamente � pr�xima pergunta\n"
 "\n"
 
-#: g10/pkclist.c:385
+#: g10/pkclist.c:405
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: Usando chave n�o confi�vel!\n"
 
-#: g10/pkclist.c:421
+#: g10/pkclist.c:441
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:422
+#: g10/pkclist.c:442
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Isto pode significar que a assinatura � falsificada.\n"
 
-#: g10/pkclist.c:443
+#: g10/pkclist.c:463
 msgid "Note: This key has expired!\n"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/pkclist.c:450
+#: g10/pkclist.c:470
 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:452
+#: g10/pkclist.c:472
 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:468
+#: g10/pkclist.c:488
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: N�s N�O confiamos nesta chave!\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:489
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         A assinatura � provavelmente uma FALSIFICA��O.\n"
 
-#: g10/pkclist.c:476
+#: g10/pkclist.c:496
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "AVISO: Esta chave n�o est� certificada com assinaturas confi�veis!\n"
 
-#: g10/pkclist.c:479
+#: g10/pkclist.c:499
 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:532 g10/pkclist.c:545 g10/pkclist.c:607 g10/pkclist.c:635
+#: g10/pkclist.c:552 g10/pkclist.c:565 g10/pkclist.c:628 g10/pkclist.c:656
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:574
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1067,20 +1070,20 @@ msgstr ""
 "Voc� n�o especificou um ID de usu�rio. (pode-se usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:579
 msgid "Enter the user ID: "
 msgstr "Digite o identificador de usu�rio:"
 
-#: g10/pkclist.c:570
+#: g10/pkclist.c:590
 msgid "No such user ID.\n"
 msgstr "Identificador de usu�rio inexistente.\n"
 
-#: g10/pkclist.c:615
+#: g10/pkclist.c:636
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: erro verificando chave: %s\n"
 
-#: g10/pkclist.c:641
+#: g10/pkclist.c:662
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
@@ -1231,7 +1234,7 @@ msgstr "A chave expira em %s\n"
 msgid "Is this correct (y/n)? "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:582
+#: g10/keygen.c:583
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1247,23 +1250,23 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:593
+#: g10/keygen.c:594
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:597
+#: g10/keygen.c:598
 msgid "Invalid character in name\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:599
+#: g10/keygen.c:600
 msgid "Name may not start with a digit\n"
 msgstr "O nome n�o deve come�ar com um d�gito\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:602
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:609
+#: g10/keygen.c:610
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
@@ -1279,7 +1282,12 @@ msgstr "Coment�rio: "
 msgid "Invalid character in comment\n"
 msgstr "Caractere inv�lido no coment�rio\n"
 
-#: g10/keygen.c:655
+#: g10/keygen.c:657
+#, c-format
+msgid "You are using the `%s' character set.\n"
+msgstr ""
+
+#: g10/keygen.c:663
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1290,15 +1298,15 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:658
+#: g10/keygen.c:666
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeVvSs"
 
-#: g10/keygen.c:668
+#: g10/keygen.c:676
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muda (N)ome, (C)oment�rio, (E)ndere�o ou (V)�lido/(S)air? "
 
-#: g10/keygen.c:720
+#: g10/keygen.c:728
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1306,11 +1314,11 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:389 g10/keygen.c:728
+#: g10/keyedit.c:389 g10/keygen.c:736
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keygen.c:734
+#: g10/keygen.c:742
 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"
@@ -1322,7 +1330,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:755
+#: g10/keygen.c:763
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (work in another window, move the mouse, utilize the\n"
@@ -1336,33 +1344,33 @@ msgstr ""
 "aleat�rios\n"
 "uma chance melhor de conseguir entropia suficiente.\n"
 
-#: g10/keygen.c:825
+#: g10/keygen.c:833
 msgid "Key generation can only be used in interactive mode\n"
 msgstr "A gera��o de chaves s� pode ser feita em modo interativo\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:841
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:839
+#: g10/keygen.c:847
 msgid "Key generation cancelled.\n"
 msgstr "Gera��o de chaves cancelada.\n"
 
-#: g10/keygen.c:849
+#: g10/keygen.c:857
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:850
+#: g10/keygen.c:858
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:927
+#: g10/keygen.c:935
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:929
+#: g10/keygen.c:937
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -1372,30 +1380,30 @@ msgstr ""
 "o comando \"--add-key\" para gerar uma chave secund�ria para esse "
 "prop�sito.\n"
 
-#: g10/keygen.c:943 g10/keygen.c:1042
+#: g10/keygen.c:951 g10/keygen.c:1050
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:987 g10/sig-check.c:172 g10/sign.c:52
+#: g10/keygen.c:995 g10/sig-check.c:209 g10/sign.c:52
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "chave p�blica criada no futuro (viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:989 g10/sig-check.c:174 g10/sign.c:54
+#: g10/keygen.c:997 g10/sig-check.c:211 g10/sign.c:54
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "chave p�blica criada no futuro (viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:1028
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: g10/encode.c:88 g10/openfile.c:86 g10/openfile.c:169 g10/tdbio.c:467
+#: g10/encode.c:88 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
 #: g10/tdbio.c:527
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1406,17 +1414,17 @@ msgstr "%s: imposs�vel abrir: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "erro criando frase secreta: %s\n"
 
-#: g10/encode.c:155 g10/encode.c:269
+#: g10/encode.c:161 g10/encode.c:275
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: arquivo vazio\n"
 
-#: g10/encode.c:222
+#: g10/encode.c:228
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:397
+#: g10/encode.c:403
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s codificado para: %s\n"
@@ -1448,12 +1456,12 @@ msgstr "entradas demais no cache pk - desabilitado\n"
 msgid "too many entries in unk cache - disabled\n"
 msgstr "entradas demais no cache unk - desabilitado\n"
 
-#: g10/getkey.c:1496 g10/getkey.c:1552
+#: g10/getkey.c:1502 g10/getkey.c:1558
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#: g10/import.c:116 g10/trustdb.c:1318
+#: g10/import.c:116 g10/trustdb.c:1228
 #, c-format
 msgid "can't open file: %s\n"
 msgstr "imposs�vel abrir arquivo: %s\n"
@@ -1463,12 +1471,12 @@ msgstr "imposs�vel abrir arquivo: %s\n"
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:167 g10/trustdb.c:1635 g10/trustdb.c:1704
+#: g10/import.c:167 g10/trustdb.c:1564 g10/trustdb.c:1637
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu chaves processadas at� agora\n"
 
-#: g10/import.c:172 g10/trustdb.c:1394
+#: g10/import.c:172 g10/trustdb.c:1304
 #, c-format
 msgid "read error: %s\n"
 msgstr "erro de leitura: %s\n"
@@ -1551,7 +1559,7 @@ msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 msgid "no default public keyring\n"
 msgstr "sem anel de chaves p�blico padr�o\n"
 
-#: g10/import.c:374 g10/openfile.c:113 g10/sign.c:215 g10/sign.c:601
+#: g10/import.c:374 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:498
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
@@ -2121,72 +2129,76 @@ msgstr "Nenhuma assinatura correspondente no anel de chaves secreto\n"
 msgid "No user id with index %d\n"
 msgstr "Nenhum id de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1372
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secund�ria com �ndice %d\n"
 
-#: g10/mainproc.c:199
+#: g10/mainproc.c:202
 #, fuzzy
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados codificados com chave p�blica: DEK bom\n"
 
-#: g10/mainproc.c:202
+#. 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 conetxt.  do_proc_packets can then use
+#. * this list to display some information
+#: g10/mainproc.c:209
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decodifica��o de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:229
+#: g10/mainproc.c:236
 msgid "decryption okay\n"
 msgstr "decodifica��o correta\n"
 
-#: g10/mainproc.c:232
+#: g10/mainproc.c:239
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decodifia��o falhou: %s\n"
 
-#: g10/mainproc.c:249
+#: g10/mainproc.c:256
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:251
+#: g10/mainproc.c:258
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:831
+#: g10/mainproc.c:839
 msgid "signature verification suppressed\n"
 msgstr "verifia��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:837
+#: g10/mainproc.c:845
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Assinatura feita %.*s usando %s ID da chave %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:863 g10/mainproc.c:874
+#: g10/mainproc.c:871 g10/mainproc.c:882
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:864 g10/mainproc.c:875
+#: g10/mainproc.c:872 g10/mainproc.c:883
 msgid "Good signature from \""
 msgstr "Assinatura correta de\""
 
-#: g10/mainproc.c:866
+#: g10/mainproc.c:874
 #, fuzzy
 msgid "                aka \""
 msgstr "              importados: %lu"
 
-#: g10/mainproc.c:908
+#: g10/mainproc.c:916
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:981
+#: g10/mainproc.c:989
 msgid "old style (PGP 2.x) signature\n"
 msgstr "assinatura antiga (PGP2.x)\n"
 
-#: g10/mainproc.c:986
+#: g10/mainproc.c:994
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -2304,28 +2316,28 @@ msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Chave fraca detectada - por favor mude a frase secreta novamente\n"
 
-#: g10/sig-check.c:155
+#: g10/sig-check.c:192
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "esta � uma chave ElGamal gerada pelo PGP que N�O � segura para assinaturas!\n"
 
-#: g10/sig-check.c:163
+#: g10/sig-check.c:200
 #, fuzzy, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "lid %lu: id de usu�rio sem assinatura\n"
 
-#: g10/sig-check.c:164
+#: g10/sig-check.c:201
 #, fuzzy, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "lid %lu: id de usu�rio sem assinatura\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:217
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTA: chave de assinatura expirou %s\n"
 
-#: g10/sig-check.c:237
+#: g10/sig-check.c:274
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
@@ -2334,7 +2346,7 @@ msgstr ""
 msgid "%s signature from: %s\n"
 msgstr "%s assinatura de: %s\n"
 
-#: g10/sign.c:210 g10/sign.c:596
+#: g10/sign.c:210 g10/sign.c:493
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
@@ -2348,11 +2360,16 @@ msgstr "assinando:"
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/textfilter.c:199
+#: g10/textfilter.c:122
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr ""
 
+#: g10/textfilter.c:189
+#, c-format
+msgid "input line longer than %d characters\n"
+msgstr ""
+
 #: g10/tdbio.c:117 g10/tdbio.c:1448
 #, fuzzy, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
@@ -2373,12 +2390,12 @@ msgstr "transa��o de banco de dados de confian�a muito grande\n"
 msgid "%s: can't access: %s\n"
 msgstr "%s: imposs�vel acessar: %s\n"
 
-#: g10/ringedit.c:294 g10/tdbio.c:444
+#: g10/ringedit.c:296 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
 
-#: g10/ringedit.c:300 g10/tdbio.c:447
+#: g10/ringedit.c:302 g10/tdbio.c:447
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: diret�rio criado\n"
@@ -2388,7 +2405,7 @@ msgstr "%s: diret�rio criado\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diret�rio inexistente!\n"
 
-#: g10/openfile.c:109 g10/openfile.c:176 g10/ringedit.c:1310 g10/tdbio.c:457
+#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1325 g10/tdbio.c:457
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: imposs�vel criar: %s\n"
@@ -2484,167 +2501,167 @@ msgstr "%s: falha ao zerar um registro: %s\n"
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: falha ao anexar um registro: %s\n"
 
-#: g10/trustdb.c:144
+#: g10/trustdb.c:165
 #, fuzzy
 msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
 msgstr ""
 "O banco de dados de confian�a est� danificado; por favor rode\n"
 "\"gpgm --fix-trust-db\".\n"
 
-#: g10/trustdb.c:157
+#: g10/trustdb.c:178
 #, fuzzy, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registro de confian�a %lu, tipo req %d: leitura falhou: %s\n"
 
-#: g10/trustdb.c:172
+#: g10/trustdb.c:193
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registro de confian�a %lu, tipo %d: grava��o falhou: %s\n"
 
-#: g10/trustdb.c:186
+#: g10/trustdb.c:207
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "registro de confian�a %lu: remo��o falhou: %s\n"
 
-#: g10/trustdb.c:200
+#: g10/trustdb.c:221
 #, fuzzy, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "banco de dados de confian�a: sincroniza��o falhou: %s\n"
 
-#: g10/trustdb.c:329
+#: g10/trustdb.c:351
 #, fuzzy, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "erro lendo registro de diret�rio para LID %lu: %s\n"
 
-#: g10/trustdb.c:336
+#: g10/trustdb.c:358
 #, fuzzy, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: registro de diret�rio esperado, tipo %d recebido\n"
 
-#: g10/trustdb.c:341
+#: g10/trustdb.c:363
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "nenhuma chave prim�ria para LID %lu\n"
 
-#: g10/trustdb.c:346
+#: g10/trustdb.c:368
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "erro lendo chave prim�ria para LID %lu: %s\n"
 
-#: g10/trustdb.c:422
+#: g10/trustdb.c:445
 #, fuzzy, c-format
 msgid "chained sigrec %lu has a wrong owner\n"
 msgstr "sigrec em cadeia %lu possui dono errado\n"
 
-#: g10/trustdb.c:465
+#: g10/trustdb.c:488
 #, fuzzy, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "%s n�o � um mapa de caracteres v�lido\n"
 
-#: g10/trustdb.c:500
+#: g10/trustdb.c:523
 #, fuzzy, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/trustdb.c:509 g10/trustdb.c:567
+#: g10/trustdb.c:532 g10/trustdb.c:590
 #, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "chave %08lX: imposs�vel coloc�-la no banco de dados de confian�a\n"
 
-#: g10/trustdb.c:514 g10/trustdb.c:573
+#: g10/trustdb.c:537 g10/trustdb.c:596
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "chave %08lX: pedido de registro falhou\n"
 
-#: g10/trustdb.c:519 g10/trustdb.c:582
+#: g10/trustdb.c:542 g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "chave %08lX: j� est� na tabela de chaves secretas\n"
 
-#: g10/trustdb.c:522 g10/trustdb.c:585
+#: g10/trustdb.c:545 g10/trustdb.c:608
 #, fuzzy, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "chave %08lX: aceita como chave secreta.\n"
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:561
 #, c-format
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "NOTA: chave secreta %08lX N�O est� protegida.\n"
 
-#: g10/trustdb.c:550
+#: g10/trustdb.c:573
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/trustdb.c:557
+#: g10/trustdb.c:580
 #, c-format
 msgid "key %08lX: secret and public key don't match\n"
 msgstr "chave %08lX: chaves secreta e p�blica n�o combinam\n"
 
-#: g10/trustdb.c:593
+#: g10/trustdb.c:616
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/trustdb.c:776
+#: g10/trustdb.c:770
 #, fuzzy, c-format
 msgid "lid %lu: read dir record failed: %s\n"
 msgstr "lid %lu: leitura de registro de diret�rio falhou: %s\n"
 
-#: g10/trustdb.c:785
+#: g10/trustdb.c:779
 #, c-format
 msgid "lid %lu: read key record failed: %s\n"
 msgstr "lid %lu: leitura de registro de chave falhou: %s\n"
 
-#: g10/trustdb.c:795
+#: g10/trustdb.c:789
 #, c-format
 msgid "lid %lu: read uid record failed: %s\n"
 msgstr "lid %lu: leitura de registro de uid falhou: %s\n"
 
-#: g10/trustdb.c:804
+#: g10/trustdb.c:798
 #, fuzzy, c-format
 msgid "lid %lu: read pref record failed: %s\n"
 msgstr "lid %lu: leitura de registro de prefer�ncias falhou: %s\n"
 
-#: g10/trustdb.c:814
+#: g10/trustdb.c:808
 #, c-format
 msgid "lid %lu: read sig record failed: %s\n"
 msgstr "lid %lu: leitura de registro de assinatura falhou: %s\n"
 
-#: g10/trustdb.c:1151
+#: g10/trustdb.c:1037
 msgid "Ooops, no keys\n"
 msgstr "Ooops, nenhuma chave\n"
 
-#: g10/trustdb.c:1155
+#: g10/trustdb.c:1041
 msgid "Ooops, no user ids\n"
 msgstr "Ooops, nenhum id de usu�rio\n"
 
-#: g10/trustdb.c:1226 g10/trustdb.c:1244
+#: g10/trustdb.c:1134 g10/trustdb.c:1152
 #, fuzzy, c-format
 msgid "user '%s' read problem: %s\n"
 msgstr "erro de leitura do usu�rio `%s': %s\n"
 
-#: g10/trustdb.c:1229 g10/trustdb.c:1247
+#: g10/trustdb.c:1137 g10/trustdb.c:1155
 #, fuzzy, c-format
 msgid "user '%s' list problem: %s\n"
 msgstr "erro de listagem do usu�rio `%s': %s\n"
 
-#: g10/trustdb.c:1237 g10/trustdb.c:1485
+#: g10/trustdb.c:1145 g10/trustdb.c:1447
 #, fuzzy, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/trustdb.c:1239 g10/trustdb.c:1487
+#: g10/trustdb.c:1147 g10/trustdb.c:1449
 #, fuzzy, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problemas encontrando `%s' no banco de dados de confian�a: %s\n"
 
-#: g10/trustdb.c:1242
+#: g10/trustdb.c:1150
 #, fuzzy, c-format
 msgid "user '%s' not in trustdb\n"
 msgstr "usu�rio `%s' n�o est� no banco de dados de confian�a\n"
 
-#: g10/trustdb.c:1277
+#: g10/trustdb.c:1186
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -2653,206 +2670,206 @@ msgstr ""
 "# Lista de valores de confian�a designados, criada em %s\n"
 "# (Use \"gpgm --import-ownertrust\" para restaur�-los)\n"
 
-#: g10/trustdb.c:1283
+#: g10/trustdb.c:1192
 msgid "directory record w/o primary key\n"
 msgstr "registro de diret�rio sem chave prim�ria\n"
 
-#: g10/trustdb.c:1290
+#: g10/trustdb.c:1199
 #, c-format
 msgid "error reading key record: %s\n"
 msgstr "erro lendo registro de chave: %s\n"
 
-#: g10/trustdb.c:1330
+#: g10/trustdb.c:1240
 msgid "line too long\n"
 msgstr "linha muito longa\n"
 
-#: g10/trustdb.c:1338
+#: g10/trustdb.c:1248
 msgid "error: missing colon\n"
 msgstr "erro: falta dois pontos\n"
 
-#: g10/trustdb.c:1343
+#: g10/trustdb.c:1253
 msgid "error: invalid fingerprint\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/trustdb.c:1347
+#: g10/trustdb.c:1257
 msgid "error: no ownertrust value\n"
 msgstr "erro: nenhum valor de confian�a\n"
 
-#: g10/trustdb.c:1372
+#: g10/trustdb.c:1282
 msgid "key not in trustdb, searching ring.\n"
 msgstr ""
 "chave n�o encontrada no banco de dados de confian�a, procurando no anel\n"
 
-#: g10/trustdb.c:1375
+#: g10/trustdb.c:1285
 #, c-format
 msgid "key not in ring: %s\n"
 msgstr "chave n�o encontrada no anel: %s\n"
 
-#: g10/trustdb.c:1379
+#: g10/trustdb.c:1289
 msgid "Oops: key is now in trustdb???\n"
 msgstr "Oops: agora a chave est� no banco de dados de confian�a???\n"
 
 #. update the ownertrust
-#: g10/trustdb.c:1384
+#: g10/trustdb.c:1294
 #, c-format
 msgid "insert trust record failed: %s\n"
 msgstr "inser��o de registro de confian�a falhou: %s\n"
 
 #. error
-#: g10/trustdb.c:1390
+#: g10/trustdb.c:1300
 #, fuzzy, c-format
 msgid "error finding dir record: %s\n"
 msgstr "erro encontrando registro de diret�rio: %s\n"
 
-#: g10/trustdb.c:1490
+#: g10/trustdb.c:1452
 #, fuzzy, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr ""
 "usu�rio `%s' n�o encontrado no banco de dados de confian�a - inserindo\n"
 
-#: g10/trustdb.c:1493
+#: g10/trustdb.c:1455
 #, fuzzy, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "falha ao colocar `%s' no banco de dados de confian�a: %s\n"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1494
 #, c-format
 msgid "%s: keyblock read problem: %s\n"
 msgstr "%s: erro de leitura de bloco de chaves: %s\n"
 
-#: g10/trustdb.c:1579
+#: g10/trustdb.c:1508
 #, c-format
 msgid "%s: update failed: %s\n"
 msgstr "%s: atualiza��o falhou: %s\n"
 
-#: g10/trustdb.c:1582
+#: g10/trustdb.c:1511
 #, c-format
 msgid "%s: updated\n"
 msgstr "%s: atualizado\n"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1513
 #, c-format
 msgid "%s: okay\n"
 msgstr "%s: correto\n"
 
-#: g10/trustdb.c:1599
+#: g10/trustdb.c:1528
 #, fuzzy, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: registro de diret�rio sem chave - ignorado\n"
 
-#: g10/trustdb.c:1612
+#: g10/trustdb.c:1541
 #, c-format
 msgid "lid %lu: keyblock not found: %s\n"
 msgstr "lid %lu: bloco de chaves n�o encontrado: %s\n"
 
-#: g10/trustdb.c:1621 g10/trustdb.c:1690
+#: g10/trustdb.c:1550 g10/trustdb.c:1623
 #, c-format
 msgid "lid %lu: update failed: %s\n"
 msgstr "lid %lu: atualiza��o falhou %s\n"
 
-#: g10/trustdb.c:1627 g10/trustdb.c:1696
+#: g10/trustdb.c:1556 g10/trustdb.c:1629
 #, c-format
 msgid "lid %lu: updated\n"
 msgstr "lid %lu: atualizado\n"
 
-#: g10/trustdb.c:1631 g10/trustdb.c:1700
+#: g10/trustdb.c:1560 g10/trustdb.c:1633
 #, c-format
 msgid "lid %lu: okay\n"
 msgstr "lid %lu: correto\n"
 
-#: g10/trustdb.c:1638 g10/trustdb.c:1706
+#: g10/trustdb.c:1567 g10/trustdb.c:1639
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/trustdb.c:1640
+#: g10/trustdb.c:1569
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu chaves ignoradas\n"
 
-#: g10/trustdb.c:1642 g10/trustdb.c:1708
+#: g10/trustdb.c:1571 g10/trustdb.c:1641
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu chaves com erros\n"
 
-#: g10/trustdb.c:1644 g10/trustdb.c:1710
+#: g10/trustdb.c:1573 g10/trustdb.c:1643
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu chaves atualizadas\n"
 
-#: g10/trustdb.c:1674
+#: g10/trustdb.c:1607
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: inser��o falhou: %s\n"
 
-#: g10/trustdb.c:1679
+#: g10/trustdb.c:1612
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: inser��o falhou: %s\n"
 
-#: g10/trustdb.c:1685
+#: g10/trustdb.c:1618
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: inserido\n"
 
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1645
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu chaves inseridas\n"
 
-#: g10/trustdb.c:1715
+#: g10/trustdb.c:1648
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/trustdb.c:1760
+#: g10/trustdb.c:1694
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: busca de registro de diret�rio falhou: %s\n"
 
-#: g10/trustdb.c:1767
+#: g10/trustdb.c:1701
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "chave %08lX: inser��o de registro de confian�a falhou: %s\n"
 
-#: g10/trustdb.c:1771
+#: g10/trustdb.c:1705
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "chave %08lX.%lu: inserida no banco de dados de confian�a\n"
 
-#: g10/trustdb.c:1779
+#: g10/trustdb.c:1713
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "chave %08lX.%lu: criada no futuro (viagem no tempo ou problema no relogio)\n"
 
-#: g10/trustdb.c:1786
+#: g10/trustdb.c:1720
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "chave %08lX.%lu: expirada em %s\n"
 
-#: g10/trustdb.c:1794
+#: g10/trustdb.c:1728
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "chave %08lX.%lu: verifica��o de confian�a falhou: %s\n"
 
-#: g10/trustdb.c:2003 g10/trustdb.c:2032 g10/trustdb.c:2771
+#: g10/trustdb.c:1951 g10/trustdb.c:1981 g10/trustdb.c:2734
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "AVISO: ainda � imposs�vel manipular registros de prefer�ncias longos\n"
 
-#: g10/trustdb.c:2054
+#: g10/trustdb.c:2003
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/trustdb.c:2117
+#: g10/trustdb.c:2071
 #, fuzzy, c-format
 msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n"
 msgstr ""
 "NOTA: assinatura rec %lu[%d] em lista de sugest�es de %lu mas marcada\n"
 "como verificada\n"
 
-#: g10/trustdb.c:2121
+#: g10/trustdb.c:2075
 #, fuzzy, c-format
 msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n"
 msgstr ""
@@ -2860,183 +2877,183 @@ msgstr ""
 "marcada\n"
 
 #. we need the dir record
-#: g10/trustdb.c:2128
+#: g10/trustdb.c:2082
 #, c-format
 msgid "sig rec %lu[%d] in hintlist of %lu does not point to a dir record\n"
 msgstr ""
 "assinatura rec %lu[%d] em lista de sugest�es de %lu n�o aponta para\n"
 "um registro de diret�rio\n"
 
-#: g10/trustdb.c:2134
+#: g10/trustdb.c:2088
 #, c-format
 msgid "lid %lu: no primary key\n"
 msgstr "lid %lu: nenhuma chave prim�ria\n"
 
-#: g10/trustdb.c:2167
+#: g10/trustdb.c:2121
 #, c-format
 msgid "lid %lu: user id not found in keyblock\n"
 msgstr "lid %lu: id de usu�rio n�o encontrado no bloco de chaves\n"
 
-#: g10/trustdb.c:2171
+#: g10/trustdb.c:2125
 #, c-format
 msgid "lid %lu: user id without signature\n"
 msgstr "lid %lu: id de usu�rio sem assinatura\n"
 
-#: g10/trustdb.c:2178
+#: g10/trustdb.c:2132
 #, c-format
 msgid "lid %lu: self-signature in hintlist\n"
 msgstr "lid %lu: auto-assinatura na lista de sugest�es\n"
 
-#: g10/trustdb.c:2189 g10/trustdb.c:2910 g10/trustdb.c:2994
+#: g10/trustdb.c:2143 g10/trustdb.c:2879 g10/trustdb.c:2962
 msgid "Valid certificate revocation"
 msgstr "Certificado de revoga��o v�lido"
 
-#: g10/trustdb.c:2190 g10/trustdb.c:2911 g10/trustdb.c:2995
+#: g10/trustdb.c:2144 g10/trustdb.c:2880 g10/trustdb.c:2963
 msgid "Good certificate"
 msgstr "Certificado correto"
 
-#: g10/trustdb.c:2199
+#: g10/trustdb.c:2153
 msgid "very strange: no public key\n"
 msgstr "muito estranho: nenhuma chave p�blica\n"
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2201
 #, c-format
 msgid "hintlist %lu[%d] of %lu does not point to a dir record\n"
 msgstr ""
 "lista de sugest�es %lu[%d] de %lu n�o aponta para registro de diret�rio\n"
 
-#: g10/trustdb.c:2253
+#: g10/trustdb.c:2207
 #, c-format
 msgid "lid %lu does not have a key\n"
 msgstr "lid %lu n�o tem uma chave\n"
 
-#: g10/trustdb.c:2263
+#: g10/trustdb.c:2217
 #, c-format
 msgid "lid %lu: can't get keyblock: %s\n"
 msgstr "lid %lu: imposs�vel pegar bloco de chaves: %s\n"
 
-#: g10/trustdb.c:2320 g10/trustdb.c:3245
+#: g10/trustdb.c:2274 g10/trustdb.c:3227
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir falhou: %s\n"
 
-#: g10/trustdb.c:2473
+#: g10/trustdb.c:2427
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "chave %08lX.%lu: Liga��o de subchave v�lida\n"
 
-#: g10/trustdb.c:2479 g10/trustdb.c:2521
+#: g10/trustdb.c:2433 g10/trustdb.c:2475
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "chave %08lX.%lu: Liga��o de subchave inv�lida: %s\n"
 
-#: g10/trustdb.c:2494
+#: g10/trustdb.c:2448
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "chave %08lX.%lu: Revoga��o de chave v�lida\n"
 
-#: g10/trustdb.c:2500
+#: g10/trustdb.c:2454
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "chave %08lX.%lu: Revoga��o de chave inv�lida: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2469
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "chave %08lX.%lu: Revoga��o de subchave v�lida\n"
 
-#: g10/trustdb.c:2615
+#: g10/trustdb.c:2573
 msgid "Good self-signature"
 msgstr "Auto-assinatura v�lida"
 
-#: g10/trustdb.c:2626
+#: g10/trustdb.c:2584
 msgid "Invalid self-signature"
 msgstr "Auto-assinatura inv�lida"
 
-#: g10/trustdb.c:2636
+#: g10/trustdb.c:2594
 msgid "Valid user ID revocation skipped due to a newer self signature\n"
 msgstr ""
 
-#: g10/trustdb.c:2643
+#: g10/trustdb.c:2601
 msgid "Valid user ID revocation\n"
 msgstr "Revoga��o de ID de usu�rio v�lida\n"
 
-#: g10/trustdb.c:2650
+#: g10/trustdb.c:2608
 msgid "Invalid user ID revocation"
 msgstr "Revoga��o de ID de usu�rio inv�lida"
 
-#: g10/trustdb.c:2734
+#: g10/trustdb.c:2697
 msgid "Too many preferences"
 msgstr "Muitas prefer�ncias"
 
-#: g10/trustdb.c:2748
+#: g10/trustdb.c:2711
 msgid "Too many preference items"
 msgstr "Muitos itens de prefer�ncia"
 
-#: g10/trustdb.c:2888
+#: g10/trustdb.c:2857
 #, fuzzy
 msgid "duplicated certificate - deleted"
 msgstr "Certificado duplicado - deletado"
 
-#: g10/trustdb.c:2922
+#: g10/trustdb.c:2891
 msgid "Hmmm, public key lost?"
 msgstr "Hmmm, chave p�blica perdida?"
 
-#: g10/trustdb.c:2932 g10/trustdb.c:3015
+#: g10/trustdb.c:2900 g10/trustdb.c:2983
 msgid "Invalid certificate revocation"
 msgstr "Certificado de revoga��o inv�lido"
 
-#: g10/trustdb.c:2933 g10/trustdb.c:3016
+#: g10/trustdb.c:2901 g10/trustdb.c:2984
 msgid "Invalid certificate"
 msgstr "Certificado inv�lido"
 
-#: g10/trustdb.c:2948
+#: g10/trustdb.c:2916
 #, c-format
 msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n"
 msgstr ""
 "uid %08lX.%lu/%02X%02X: tem diret�rio sombra %lu mas ainda n�o est�\n"
 "marcado\n"
 
-#: g10/trustdb.c:2962
+#: g10/trustdb.c:2930
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "registro de assinatura %lu[%d] aponta para registro errado.\n"
 
 #. that should never happen
-#: g10/trustdb.c:3215
+#: g10/trustdb.c:3190
 #, c-format
 msgid "insert_trust_record: keyblock not found: %s\n"
 msgstr "insert_trust_record: bloco de chaves n�o encontrado: %s\n"
 
-#: g10/trustdb.c:3233
+#: g10/trustdb.c:3215
 msgid "did not use primary key for insert_trust_record()\n"
 msgstr "voc� usou a chave prim�ria para insert_trust_record()\n"
 
-#: g10/ringedit.c:314
+#: g10/ringedit.c:316
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: imposs�vel criar anel de chaves: %s\n"
 
-#: g10/ringedit.c:320 g10/ringedit.c:1315
+#: g10/ringedit.c:322 g10/ringedit.c:1330
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anel de chaves criado\n"
 
-#: g10/ringedit.c:1492
+#: g10/ringedit.c:1507
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: 2 arquivos com informa��es confidenciais existem.\n"
 
-#: g10/ringedit.c:1493
+#: g10/ringedit.c:1508
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o n�o modificado\n"
 
-#: g10/ringedit.c:1494
+#: g10/ringedit.c:1509
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/ringedit.c:1495
+#: g10/ringedit.c:1510
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte este poss�vel furo de seguran�a\n"
 
@@ -3072,12 +3089,12 @@ msgstr "Sobrescrever (s/N)? "
 msgid "writing to stdout\n"
 msgstr "escrevendo para \"stdout\"\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "assumindo dados assinados em `%s'\n"
 
-#: g10/openfile.c:192
+#: g10/openfile.c:197
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: novo arquivo de op��es criado\n"
diff --git a/po/ru.po b/po/ru.po
index 2ea0ef0f7..5c638b66b 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-02-19 15:31+0100\n"
+"POT-Creation-Date: 1999-03-08 19:50+0100\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-01-26 22:08:36+0100\n"
 "From: Gregory Steuck <[email protected]>\n"
@@ -21,18 +21,18 @@ msgstr ""
 "g10/mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c "
 "g10/sig-check.c g10/sign.c g10/trustdb.c g10/verify.c\n"
 
-#: util/secmem.c:77
+#: util/secmem.c:76
 msgid "Warning: using insecure memory!\n"
 msgstr ""
 "��������, �������� ������ ��������� ������!\n"
 "��� �������� ����� ������, ��������� ��������� suid(root).\n"
 "���������� ��� ����� � �������������� ����� �������.\n"
 
-#: util/secmem.c:250
+#: util/secmem.c:249
 msgid "operation is not possible without initialized secure memory\n"
 msgstr ""
 
-#: util/secmem.c:251
+#: util/secmem.c:250
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
@@ -306,7 +306,7 @@ msgstr ""
 "�� ����������� ������� ���������� ���� ����������!\n"
 "\n"
 
-#: cipher/rndlinux.c:118
+#: cipher/rndlinux.c:114
 #, c-format
 msgid ""
 "\n"
@@ -499,7 +499,10 @@ msgstr ""
 msgid "force v3 signatures"
 msgstr "��������� ������� �� �����"
 
-#. { oDryRun, "dry-run",   0, N_("do not make any changes") },
+#: g10/g10.c:235
+msgid "do not make any changes"
+msgstr "Keine wirklichen �nderungen durchf�hren"
+
 #: g10/g10.c:236
 msgid "batch mode: never ask"
 msgstr "�������� �����: ������ �� ����������"
@@ -694,124 +697,124 @@ msgstr "���� ���������� `%s': %s\n"
 msgid "reading options from `%s'\n"
 msgstr "�������� ��������� �� `%s'\n"
 
-#: g10/g10.c:796
+#: g10/g10.c:797
 #, fuzzy, c-format
 msgid "%s is not a valid character set\n"
 msgstr "������������ ������ � �����������.\n"
 
-#: g10/g10.c:836 g10/g10.c:848
+#: g10/g10.c:837 g10/g10.c:849
 msgid "selected cipher algorithm is invalid\n"
 msgstr "������ ������������ �������� ����������\n"
 
-#: g10/g10.c:842 g10/g10.c:854
+#: g10/g10.c:843 g10/g10.c:855
 msgid "selected digest algorithm is invalid\n"
 msgstr "������ ������������ ��������-��������\n"
 
-#: g10/g10.c:857
+#: g10/g10.c:858
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "�������� �������� ����� ����� �������� �� %d �� %d\n"
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ ���� ������ 0\n"
 
-#: g10/g10.c:861
+#: g10/g10.c:862
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ ���� ������ 1\n"
 
-#: g10/g10.c:863
+#: g10/g10.c:864
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:866
+#: g10/g10.c:867
 #, fuzzy
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "���������: ������� S2K ����� (0) ����� �� �������������\n"
 
-#: g10/g10.c:870
+#: g10/g10.c:871
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "������������ ����� S2K: ������ ���� 0, 1 ��� 3\n"
 
-#: g10/g10.c:947
+#: g10/g10.c:948
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "������ ������������� ���� ������ �������: %s\n"
 
-#: g10/g10.c:953
+#: g10/g10.c:954
 msgid "--store [filename]"
 msgstr "--store [��� �����]"
 
-#: g10/g10.c:961
+#: g10/g10.c:962
 msgid "--symmetric [filename]"
 msgstr "--symmetric [��� �����]"
 
-#: g10/g10.c:969
+#: g10/g10.c:970
 msgid "--encrypt [filename]"
 msgstr "--encrypt [��� �����]"
 
-#: g10/g10.c:982
+#: g10/g10.c:983
 msgid "--sign [filename]"
 msgstr "--sign [��� �����]"
 
-#: g10/g10.c:995
+#: g10/g10.c:996
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [��� �����]"
 
-#: g10/g10.c:1009
+#: g10/g10.c:1010
 msgid "--clearsign [filename]"
 msgstr "--clearsign [��� �����]"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1022
 msgid "--decrypt [filename]"
 msgstr "--decrypt [��� �����]"
 
-#: g10/g10.c:1030
+#: g10/g10.c:1031
 #, fuzzy
 msgid "--edit-key username [commands]"
 msgstr "--edit-key ���-������������"
 
-#: g10/g10.c:1046
+#: g10/g10.c:1047
 msgid "--delete-secret-key username"
 msgstr "--delete-secret-key ���-������������"
 
-#: g10/g10.c:1049
+#: g10/g10.c:1050
 msgid "--delete-key username"
 msgstr "--delete-key ���-������������"
 
-#: g10/encode.c:216 g10/g10.c:1072 g10/sign.c:311
+#: g10/encode.c:222 g10/g10.c:1073 g10/sign.c:311
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "���������� ������� ���� `%s': %s\n"
 
-#: g10/g10.c:1083
+#: g10/g10.c:1084
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [������������� ������������] [������ ������]"
 
-#: g10/g10.c:1144
+#: g10/g10.c:1145
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "������ �������������: %s\n"
 
-#: g10/g10.c:1152
+#: g10/g10.c:1153
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "������ �����������: %s\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1219
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "������������ ���-�������� `%s'\n"
 
-#: g10/g10.c:1297
+#: g10/g10.c:1298
 msgid "[filename]"
 msgstr "[��� �����]"
 
-#: g10/g10.c:1301
+#: g10/g10.c:1302
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/decrypt.c:59 g10/g10.c:1304 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1305 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "���������� ������� ���� `%s'\n"
@@ -893,7 +896,7 @@ msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 
-#: g10/pkclist.c:138
+#: g10/pkclist.c:136
 #, fuzzy, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -902,7 +905,7 @@ msgstr ""
 "�� ���������� ��������� ������� ��� %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:148
+#: g10/pkclist.c:146
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly\n"
@@ -927,30 +930,30 @@ msgstr ""
 " 4 = ���� ���������\n"
 " s = ����������, �������� �������������� ����������\n"
 
-#: g10/pkclist.c:157
+#: g10/pkclist.c:155
 msgid " m = back to the main menu\n"
 msgstr " m = ������� � ������� ����\n"
 
-#: g10/pkclist.c:159
+#: g10/pkclist.c:157
 msgid " q = quit\n"
 msgstr ""
 
 # valid user replies (not including 1..4)
 #. a string with valid answers
-#: g10/pkclist.c:164
+#: g10/pkclist.c:162
 #, fuzzy
 msgid "sSmMqQ"
 msgstr "sSmMqQ"
 
-#: g10/pkclist.c:168
+#: g10/pkclist.c:166
 msgid "Your decision? "
 msgstr "���� �������? "
 
-#: g10/pkclist.c:188
+#: g10/pkclist.c:186
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr ""
 
-#: g10/pkclist.c:223
+#: g10/pkclist.c:221
 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"
@@ -961,65 +964,65 @@ msgstr ""
 "��������� ����������� �������� \"������� ���������\"\n"
 "\n"
 
-#: g10/pkclist.c:261
+#: g10/pkclist.c:260
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:263
+#: g10/pkclist.c:262
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:265
+#: g10/pkclist.c:264
 #, fuzzy
 msgid ""
 "No trust values changed.\n"
 "\n"
 msgstr "�������� ���������� ������� �� ��������.\n"
 
-#: g10/pkclist.c:280
+#: g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "build_sigrecs: ���� ist widerrufen\n"
 
-#: g10/pkclist.c:286 g10/pkclist.c:381
+#: g10/pkclist.c:285 g10/pkclist.c:397
 msgid "Use this key anyway? "
 msgstr "��� ����� ������������ ���� ����?"
 
-#: g10/pkclist.c:308
+#: g10/pkclist.c:309
 #, fuzzy, c-format
 msgid "%08lX: key has expired\n"
 msgstr "���������: ���� �������� ����� ��� �����!\n"
 
-#: g10/pkclist.c:314
+#: g10/pkclist.c:315
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr ""
 
-#: g10/pkclist.c:332
+#: g10/pkclist.c:333
 #, fuzzy, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "��������: �� �� �������� ����� �����!\n"
 
-#: g10/pkclist.c:338
+#: g10/pkclist.c:339
 #, 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:344
+#: g10/pkclist.c:345
 msgid "This key probably belongs to the owner\n"
 msgstr ""
 
-#: g10/pkclist.c:349
+#: g10/pkclist.c:350
 msgid "This key belongs to us\n"
 msgstr ""
 
-#: g10/pkclist.c:376
+#: g10/pkclist.c:392
 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"
@@ -1030,55 +1033,55 @@ msgstr ""
 "��� ������ ��� ����������. ��������� \"��\" �� ��������� ������,\n"
 "������ ���� �� *�������������* ��������� ��� �������.\n"
 
-#: g10/pkclist.c:385
+#: g10/pkclist.c:405
 msgid "WARNING: Using untrusted key!\n"
 msgstr "��������: ������������ ���� � �������� ��� �������!\n"
 
-#: g10/pkclist.c:421
+#: g10/pkclist.c:441
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "��������: �������� ����� ��� ������� ���!\n"
 
-#: g10/pkclist.c:422
+#: g10/pkclist.c:442
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "          ��� ����� ��������, ��� ������� ����������.\n"
 
-#: g10/pkclist.c:443
+#: g10/pkclist.c:463
 msgid "Note: This key has expired!\n"
 msgstr "���������: ���� �������� ����� ��� �����!\n"
 
-#: g10/pkclist.c:450
+#: g10/pkclist.c:470
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "��������: ���� ���� �� ������� ���������� ��������!\n"
 
-#: g10/pkclist.c:452
+#: g10/pkclist.c:472
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         ��� ������� �������� �� ��, ��� ���� ����������� ��� ���������.\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:488
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "��������: �� �� �������� ����� �����!\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:489
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         ������� �������� -- ��������.\n"
 
-#: g10/pkclist.c:476
+#: g10/pkclist.c:496
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "��������: ���� ���� �� ������� ���������� ����������� ���������!\n"
 
-#: g10/pkclist.c:479
+#: g10/pkclist.c:499
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "          ��� �����������, ��� ������� ����������� ���������.\n"
 
-#: g10/pkclist.c:532 g10/pkclist.c:545 g10/pkclist.c:607 g10/pkclist.c:635
+#: g10/pkclist.c:552 g10/pkclist.c:565 g10/pkclist.c:628 g10/pkclist.c:656
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ��������: %s\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:574
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1087,20 +1090,20 @@ msgstr ""
 "\"-r\").\n"
 "\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:579
 msgid "Enter the user ID: "
 msgstr "������� ������������� ������������: "
 
-#: g10/pkclist.c:570
+#: g10/pkclist.c:590
 msgid "No such user ID.\n"
 msgstr "��� ������ �������������� ������������.\n"
 
-#: g10/pkclist.c:615
+#: g10/pkclist.c:636
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: ������ ��� �������� �����: %s\n"
 
-#: g10/pkclist.c:641
+#: g10/pkclist.c:662
 msgid "no valid addressees\n"
 msgstr "��� ���������� �������\n"
 
@@ -1252,7 +1255,7 @@ msgstr "���� ��������� �� %s\n"
 msgid "Is this correct (y/n)? "
 msgstr "��� �����? (y/n) "
 
-#: g10/keygen.c:582
+#: g10/keygen.c:583
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1268,23 +1271,23 @@ msgstr ""
 "    \"Vasya Pupkin (KRUTOI) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:593
+#: g10/keygen.c:594
 msgid "Real name: "
 msgstr "���� ��� (\"��� �������\"): "
 
-#: g10/keygen.c:597
+#: g10/keygen.c:598
 msgid "Invalid character in name\n"
 msgstr "������������ ������ � �����\n"
 
-#: g10/keygen.c:599
+#: g10/keygen.c:600
 msgid "Name may not start with a digit\n"
 msgstr "������ ��� �� ����� ���������� � �����.\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:602
 msgid "Name must be at least 5 characters long\n"
 msgstr "������ ��� ������ �������� �� ����� ��� �� 5�� ��������.\n"
 
-#: g10/keygen.c:609
+#: g10/keygen.c:610
 msgid "Email address: "
 msgstr "E-Mail: "
 
@@ -1300,7 +1303,12 @@ msgstr "�����������: "
 msgid "Invalid character in comment\n"
 msgstr "������������ ������ � �����������.\n"
 
-#: g10/keygen.c:655
+#: g10/keygen.c:657
+#, c-format
+msgid "You are using the `%s' character set.\n"
+msgstr ""
+
+#: g10/keygen.c:663
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1311,16 +1319,16 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:658
+#: g10/keygen.c:666
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:668
+#: g10/keygen.c:676
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "��������: N=���, C=�����������, E=E-Mail, O=Okay/Q=�����? "
 
-#: g10/keygen.c:720
+#: g10/keygen.c:728
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1328,11 +1336,11 @@ msgstr ""
 "��� ������ ������ ����� ����� �������� �����.\n"
 "\n"
 
-#: g10/keyedit.c:389 g10/keygen.c:728
+#: g10/keyedit.c:389 g10/keygen.c:736
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "�������� ����� �� ���� ��������������, ���������� �����.\n"
 
-#: g10/keygen.c:734
+#: g10/keygen.c:742
 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"
@@ -1344,7 +1352,7 @@ msgstr ""
 "�����, �������� ��� ��������� � ���������� \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:755
+#: g10/keygen.c:763
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (work in another window, move the mouse, utilize the\n"
@@ -1356,34 +1364,34 @@ msgstr ""
 "��������� ������� ��� �������� ����������). ��� ���� ���������� ���������\n"
 "����� ����������� ������� ���������� ��������.\n"
 
-#: g10/keygen.c:825
+#: g10/keygen.c:833
 msgid "Key generation can only be used in interactive mode\n"
 msgstr "��������� ����� ����� ���� ��������� ������ � ������������� ������.\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:841
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "�������� ���� DSA ����� ����� ����� 1024 ����.\n"
 
-#: g10/keygen.c:839
+#: g10/keygen.c:847
 #, fuzzy
 msgid "Key generation cancelled.\n"
 msgstr "��������� ����� ��������: %s\n"
 
-#: g10/keygen.c:849
+#: g10/keygen.c:857
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "�������� ���������� ������������ � `%s'\n"
 
-#: g10/keygen.c:850
+#: g10/keygen.c:858
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "��������� ���������� ������������ � `%s'\n"
 
-#: g10/keygen.c:927
+#: g10/keygen.c:935
 msgid "public and secret key created and signed.\n"
 msgstr "�������� � ��������� ����� ������� � ���������.\n"
 
-#: g10/keygen.c:929
+#: g10/keygen.c:937
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -1394,12 +1402,12 @@ msgstr ""
 "���������������\n"
 "����� ��� ����������.\n"
 
-#: g10/keygen.c:943 g10/keygen.c:1042
+#: g10/keygen.c:951 g10/keygen.c:1050
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "��������� ����� �� �������: %s\n"
 
-#: g10/keygen.c:987 g10/sig-check.c:172 g10/sign.c:52
+#: g10/keygen.c:995 g10/sig-check.c:209 g10/sign.c:52
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1407,7 +1415,7 @@ msgstr ""
 "�������� ���� ������������ � ������� (����������� ������� ��� ����������� "
 "����������� ����)\n"
 
-#: g10/keygen.c:989 g10/sig-check.c:174 g10/sign.c:54
+#: g10/keygen.c:997 g10/sig-check.c:211 g10/sign.c:54
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1415,12 +1423,12 @@ msgstr ""
 "�������� ���� ������������ � ������� (����������� ������� ��� ����������� "
 "����������� ����)\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:1028
 #, fuzzy
 msgid "Really create? "
 msgstr "������������� �������? "
 
-#: g10/encode.c:88 g10/openfile.c:86 g10/openfile.c:169 g10/tdbio.c:467
+#: g10/encode.c:88 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
 #: g10/tdbio.c:527
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1431,17 +1439,17 @@ msgstr "%s: ���������� �������: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "������ ��� �������� �������� �����: %s\n"
 
-#: g10/encode.c:155 g10/encode.c:269
+#: g10/encode.c:161 g10/encode.c:275
 #, fuzzy, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ��������������: ������ ����.\n"
 
-#: g10/encode.c:222
+#: g10/encode.c:228
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "�������� �� `%s'\n"
 
-#: g10/encode.c:397
+#: g10/encode.c:403
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s ����������� ���: %s\n"
@@ -1474,12 +1482,12 @@ msgstr ""
 msgid "too many entries in unk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:1496 g10/getkey.c:1552
+#: g10/getkey.c:1502 g10/getkey.c:1558
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "������������ �������������� ���� %09lX ������ ��������� %08lX%\n"
 
-#: g10/import.c:116 g10/trustdb.c:1318
+#: g10/import.c:116 g10/trustdb.c:1228
 #, c-format
 msgid "can't open file: %s\n"
 msgstr "���������� ������� ����: %s\n"
@@ -1489,12 +1497,12 @@ msgstr "���������� ������� ����: %s\n"
 msgid "skipping block of type %d\n"
 msgstr "���������� ���� ���� %d\n"
 
-#: g10/import.c:167 g10/trustdb.c:1635 g10/trustdb.c:1704
+#: g10/import.c:167 g10/trustdb.c:1564 g10/trustdb.c:1637
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr ""
 
-#: g10/import.c:172 g10/trustdb.c:1394
+#: g10/import.c:172 g10/trustdb.c:1304
 #, c-format
 msgid "read error: %s\n"
 msgstr "������ ������: %s\n"
@@ -1577,7 +1585,7 @@ msgstr "���� %08lX: �������� ���� �� ������: %s\n"
 msgid "no default public keyring\n"
 msgstr "��� ������ �������� ������ �� ���������\n"
 
-#: g10/import.c:374 g10/openfile.c:113 g10/sign.c:215 g10/sign.c:601
+#: g10/import.c:374 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:498
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������������ � `%s'\n"
@@ -2169,73 +2177,77 @@ msgstr ""
 msgid "No user id with index %d\n"
 msgstr "��� �������������� ������������ � �������� %d\n"
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1372
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "��� ��������������� ����� � �������� %d\n"
 
-#: g10/mainproc.c:199
+#: g10/mainproc.c:202
 #, fuzzy
 msgid "public key encrypted data: good DEK\n"
 msgstr "����������� �������� ������ �� ������� %s\n"
 
-#: g10/mainproc.c:202
+#. 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 conetxt.  do_proc_packets can then use
+#. * this list to display some information
+#: g10/mainproc.c:209
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "����������� �������� ������ �� ������� %s\n"
 
-#: g10/mainproc.c:229
+#: g10/mainproc.c:236
 #, fuzzy
 msgid "decryption okay\n"
 msgstr "����������� �� �������: %s\n"
 
-#: g10/mainproc.c:232
+#: g10/mainproc.c:239
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "����������� �� �������: %s\n"
 
-#: g10/mainproc.c:249
+#: g10/mainproc.c:256
 #, fuzzy
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "���������: ����������� �������� \"������-���-�����-����\"\n"
 
-#: g10/mainproc.c:251
+#: g10/mainproc.c:258
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:831
+#: g10/mainproc.c:839
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:837
+#: g10/mainproc.c:845
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "������� ������� %.*s, ��������� %s ���� %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:863 g10/mainproc.c:874
+#: g10/mainproc.c:871 g10/mainproc.c:882
 msgid "BAD signature from \""
 msgstr "������ ������� �� \""
 
-#: g10/mainproc.c:864 g10/mainproc.c:875
+#: g10/mainproc.c:872 g10/mainproc.c:883
 msgid "Good signature from \""
 msgstr "������� ������� �� \""
 
-#: g10/mainproc.c:866
+#: g10/mainproc.c:874
 msgid "                aka \""
 msgstr ""
 
-#: g10/mainproc.c:908
+#: g10/mainproc.c:916
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "���������� ��������� �������: %s\n"
 
-#: g10/mainproc.c:981
+#: g10/mainproc.c:989
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:986
+#: g10/mainproc.c:994
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -2355,27 +2367,27 @@ msgstr "������������ �������� �����, ���������� ����� ...\n"
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "��������������: ��������� ������ ���� - ������� �������� �����.\n"
 
-#: g10/sig-check.c:155
+#: g10/sig-check.c:192
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr "���� ElGamal ����, ��������� PGP, �� ������� ��� �������� ��������!\n"
 
-#: g10/sig-check.c:163
+#: g10/sig-check.c:200
 #, fuzzy, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "���� %08lX: ��� �������������� ������������ ��� �������\n"
 
-#: g10/sig-check.c:164
+#: g10/sig-check.c:201
 #, fuzzy, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "���� %08lX: ��� �������������� ������������ ��� �������\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:217
 #, fuzzy, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "��������������: ���� ������� ������� %s\n"
 
-#: g10/sig-check.c:237
+#: g10/sig-check.c:274
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
@@ -2384,7 +2396,7 @@ msgstr ""
 msgid "%s signature from: %s\n"
 msgstr "������ ������� �� \""
 
-#: g10/sign.c:210 g10/sign.c:596
+#: g10/sign.c:210 g10/sign.c:493
 #, fuzzy, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s: ���������� �������: %s\n"
@@ -2399,11 +2411,16 @@ msgstr "���������"
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "%s: ��������������: ������ ����.\n"
 
-#: g10/textfilter.c:199
+#: g10/textfilter.c:122
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr ""
 
+#: g10/textfilter.c:189
+#, c-format
+msgid "input line longer than %d characters\n"
+msgstr ""
+
 #: g10/tdbio.c:117 g10/tdbio.c:1448
 #, fuzzy, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
@@ -2423,12 +2440,12 @@ msgstr ""
 msgid "%s: can't access: %s\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/ringedit.c:294 g10/tdbio.c:444
+#: g10/ringedit.c:296 g10/tdbio.c:444
 #, fuzzy, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/ringedit.c:300 g10/tdbio.c:447
+#: g10/ringedit.c:302 g10/tdbio.c:447
 #, fuzzy, c-format
 msgid "%s: directory created\n"
 msgstr "%s: ���������� �������: %s\n"
@@ -2438,7 +2455,7 @@ msgstr "%s: ���������� �������: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/openfile.c:109 g10/openfile.c:176 g10/ringedit.c:1310 g10/tdbio.c:457
+#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1325 g10/tdbio.c:457
 #, fuzzy, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: ���������� �������: %s\n"
@@ -2534,556 +2551,556 @@ msgstr ""
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:144
+#: g10/trustdb.c:165
 #, fuzzy
 msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
 msgstr "���� ������ ������� ���������: ��������� \"gpgm --fix-trust-db\".\n"
 
-#: g10/trustdb.c:157
+#: g10/trustdb.c:178
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:172
+#: g10/trustdb.c:193
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:186
+#: g10/trustdb.c:207
 #, fuzzy, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "���������� ������� �� �������: %s\n"
 
-#: g10/trustdb.c:200
+#: g10/trustdb.c:221
 #, fuzzy, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "���������� ���� ������ ������� �� �������: %s\n"
 
-#: g10/trustdb.c:329
+#: g10/trustdb.c:351
 #, fuzzy, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/trustdb.c:336
+#: g10/trustdb.c:358
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr ""
 
-#: g10/trustdb.c:341
+#: g10/trustdb.c:363
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr ""
 
-#: g10/trustdb.c:346
+#: g10/trustdb.c:368
 #, fuzzy, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/trustdb.c:422
+#: g10/trustdb.c:445
 #, c-format
 msgid "chained sigrec %lu has a wrong owner\n"
 msgstr ""
 
-#: g10/trustdb.c:465
+#: g10/trustdb.c:488
 #, fuzzy, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "������������ ������ � �����������.\n"
 
-#: g10/trustdb.c:500
+#: g10/trustdb.c:523
 #, fuzzy, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr "��������� ���� %08lX: �� ����� ���������������� ��������� �����.\n"
 
-#: g10/trustdb.c:509 g10/trustdb.c:567
+#: g10/trustdb.c:532 g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "���� %08lX.%lu: ���������� �������� � ���� ������ �������\n"
 
-#: g10/trustdb.c:514 g10/trustdb.c:573
+#: g10/trustdb.c:537 g10/trustdb.c:596
 #, fuzzy, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "���� %08lX: ������ ������ �� ������\n"
 
-#: g10/trustdb.c:519 g10/trustdb.c:582
+#: g10/trustdb.c:542 g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "���� %08lX: ��� �� ������ ��������� ������\n"
 
-#: g10/trustdb.c:522 g10/trustdb.c:585
+#: g10/trustdb.c:545 g10/trustdb.c:608
 #, fuzzy, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "���� %08lX: ��� �� ������ ��������� ������\n"
 
-#: g10/trustdb.c:538
+#: g10/trustdb.c:561
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "���� ���� �� �������.\n"
 
-#: g10/trustdb.c:550
+#: g10/trustdb.c:573
 #, fuzzy, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "��������� ���� %08lX: �� ����� ���������������� ��������� �����.\n"
 
-#: g10/trustdb.c:557
+#: g10/trustdb.c:580
 #, c-format
 msgid "key %08lX: secret and public key don't match\n"
 msgstr "���� %08lX: ��������� � ��������� ����� �� ���������.\n"
 
-#: g10/trustdb.c:593
+#: g10/trustdb.c:616
 #, fuzzy, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "���������� ������� �� �������: %s\n"
 
-#: g10/trustdb.c:776
+#: g10/trustdb.c:770
 #, fuzzy, c-format
 msgid "lid %lu: read dir record failed: %s\n"
 msgstr "���� %08lX.%lu: ������� ������������� ������ �� �������: %s\n"
 
-#: g10/trustdb.c:785
+#: g10/trustdb.c:779
 #, fuzzy, c-format
 msgid "lid %lu: read key record failed: %s\n"
 msgstr "���� %08lX.%lu: ������� ������������� ������ �� �������: %s\n"
 
-#: g10/trustdb.c:795
+#: g10/trustdb.c:789
 #, fuzzy, c-format
 msgid "lid %lu: read uid record failed: %s\n"
 msgstr "���� %08lX.%lu: ������� ������������� ������ �� �������: %s\n"
 
-#: g10/trustdb.c:804
+#: g10/trustdb.c:798
 #, fuzzy, c-format
 msgid "lid %lu: read pref record failed: %s\n"
 msgstr "���� %08lX.%lu: ������� ������������� ������ �� �������: %s\n"
 
-#: g10/trustdb.c:814
+#: g10/trustdb.c:808
 #, fuzzy, c-format
 msgid "lid %lu: read sig record failed: %s\n"
 msgstr "���� %08lX.%lu: ������� ������������� ������ �� �������: %s\n"
 
-#: g10/trustdb.c:1151
+#: g10/trustdb.c:1037
 msgid "Ooops, no keys\n"
 msgstr ""
 
-#: g10/trustdb.c:1155
+#: g10/trustdb.c:1041
 #, fuzzy
 msgid "Ooops, no user ids\n"
 msgstr "������ ������ � ��������������� �������������"
 
-#: g10/trustdb.c:1226 g10/trustdb.c:1244
+#: g10/trustdb.c:1134 g10/trustdb.c:1152
 #, fuzzy, c-format
 msgid "user '%s' read problem: %s\n"
 msgstr "%s: ������������ �� ������\n"
 
-#: g10/trustdb.c:1229 g10/trustdb.c:1247
+#: g10/trustdb.c:1137 g10/trustdb.c:1155
 #, fuzzy, c-format
 msgid "user '%s' list problem: %s\n"
 msgstr "%s: ������������ �� ������\n"
 
-#: g10/trustdb.c:1237 g10/trustdb.c:1485
+#: g10/trustdb.c:1145 g10/trustdb.c:1447
 #, fuzzy, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "%s: ������������ �� ������\n"
 
-#: g10/trustdb.c:1239 g10/trustdb.c:1487
+#: g10/trustdb.c:1147 g10/trustdb.c:1449
 #, fuzzy, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "������ ������������� ���� ������ �������: %s\n"
 
-#: g10/trustdb.c:1242
+#: g10/trustdb.c:1150
 #, fuzzy, c-format
 msgid "user '%s' not in trustdb\n"
 msgstr "%s: ������������ �� ������\n"
 
-#: g10/trustdb.c:1277
+#: g10/trustdb.c:1186
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpgm --import-ownertrust\" to restore them)\n"
 msgstr ""
 
-#: g10/trustdb.c:1283
+#: g10/trustdb.c:1192
 msgid "directory record w/o primary key\n"
 msgstr ""
 
-#: g10/trustdb.c:1290
+#: g10/trustdb.c:1199
 #, fuzzy, c-format
 msgid "error reading key record: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/trustdb.c:1330
+#: g10/trustdb.c:1240
 msgid "line too long\n"
 msgstr ""
 
-#: g10/trustdb.c:1338
+#: g10/trustdb.c:1248
 msgid "error: missing colon\n"
 msgstr ""
 
-#: g10/trustdb.c:1343
+#: g10/trustdb.c:1253
 #, fuzzy
 msgid "error: invalid fingerprint\n"
 msgstr "������ � ����������� ������\n"
 
-#: g10/trustdb.c:1347
+#: g10/trustdb.c:1257
 #, fuzzy
 msgid "error: no ownertrust value\n"
 msgstr "�������������� ��������� �������\n"
 
-#: g10/trustdb.c:1372
+#: g10/trustdb.c:1282
 msgid "key not in trustdb, searching ring.\n"
 msgstr ""
 
-#: g10/trustdb.c:1375
+#: g10/trustdb.c:1285
 #, fuzzy, c-format
 msgid "key not in ring: %s\n"
 msgstr "���������� �������� ������ ������: %s\n"
 
-#: g10/trustdb.c:1379
+#: g10/trustdb.c:1289
 msgid "Oops: key is now in trustdb???\n"
 msgstr ""
 
 #. update the ownertrust
-#: g10/trustdb.c:1384
+#: g10/trustdb.c:1294
 #, fuzzy, c-format
 msgid "insert trust record failed: %s\n"
 msgstr "���� %08lX.%lu: ������� ������������� ������ �� �������: %s\n"
 
 #. error
-#: g10/trustdb.c:1390
+#: g10/trustdb.c:1300
 #, fuzzy, c-format
 msgid "error finding dir record: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/trustdb.c:1490
+#: g10/trustdb.c:1452
 #, fuzzy, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "���������� ���� ������ ������� �� �������: %s\n"
 
-#: g10/trustdb.c:1493
+#: g10/trustdb.c:1455
 #, fuzzy, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "������ ������������� ���� ������ �������: %s\n"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1494
 #, c-format
 msgid "%s: keyblock read problem: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1579
+#: g10/trustdb.c:1508
 #, fuzzy, c-format
 msgid "%s: update failed: %s\n"
 msgstr "���������� �� �������: %s\n"
 
-#: g10/trustdb.c:1582
+#: g10/trustdb.c:1511
 #, c-format
 msgid "%s: updated\n"
 msgstr ""
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1513
 #, c-format
 msgid "%s: okay\n"
 msgstr ""
 
-#: g10/trustdb.c:1599
+#: g10/trustdb.c:1528
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr ""
 
-#: g10/trustdb.c:1612
+#: g10/trustdb.c:1541
 #, fuzzy, c-format
 msgid "lid %lu: keyblock not found: %s\n"
 msgstr "���� %08lX: �������� ���� �� ������: %s\n"
 
-#: g10/trustdb.c:1621 g10/trustdb.c:1690
+#: g10/trustdb.c:1550 g10/trustdb.c:1623
 #, fuzzy, c-format
 msgid "lid %lu: update failed: %s\n"
 msgstr "���������� �� �������: %s\n"
 
-#: g10/trustdb.c:1627 g10/trustdb.c:1696
+#: g10/trustdb.c:1556 g10/trustdb.c:1629
 #, c-format
 msgid "lid %lu: updated\n"
 msgstr ""
 
-#: g10/trustdb.c:1631 g10/trustdb.c:1700
+#: g10/trustdb.c:1560 g10/trustdb.c:1633
 #, c-format
 msgid "lid %lu: okay\n"
 msgstr ""
 
-#: g10/trustdb.c:1638 g10/trustdb.c:1706
+#: g10/trustdb.c:1567 g10/trustdb.c:1639
 #, c-format
 msgid "%lu keys processed\n"
 msgstr ""
 
-#: g10/trustdb.c:1640
+#: g10/trustdb.c:1569
 #, fuzzy, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "%s: ��������: %s\n"
 
-#: g10/trustdb.c:1642 g10/trustdb.c:1708
+#: g10/trustdb.c:1571 g10/trustdb.c:1641
 #, fuzzy, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "������ ������ �����"
 
-#: g10/trustdb.c:1644 g10/trustdb.c:1710
+#: g10/trustdb.c:1573 g10/trustdb.c:1643
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr ""
 
-#: g10/trustdb.c:1674
+#: g10/trustdb.c:1607
 #, fuzzy, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "���������� ������� �� �������: %s\n"
 
-#: g10/trustdb.c:1679
+#: g10/trustdb.c:1612
 #, fuzzy, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "���������� ������� �� �������: %s\n"
 
-#: g10/trustdb.c:1685
+#: g10/trustdb.c:1618
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr ""
 
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1645
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr ""
 
-#: g10/trustdb.c:1715
+#: g10/trustdb.c:1648
 #, fuzzy, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "���������� ������� �� �������: %s\n"
 
-#: g10/trustdb.c:1760
+#: g10/trustdb.c:1694
 #, fuzzy, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "���� %08lX.%lu: ������� ������������� ������ �� �������: %s\n"
 
-#: g10/trustdb.c:1767
+#: g10/trustdb.c:1701
 #, fuzzy, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "���� %08lX.%lu: ������� ������������� ������ �� �������: %s\n"
 
-#: g10/trustdb.c:1771
+#: g10/trustdb.c:1705
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "���� %08lX.%lu: �������� � ���� ������ �������\n"
 
-#: g10/trustdb.c:1779
+#: g10/trustdb.c:1713
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "���� %08lX.%lu: ������������ � ������� (����������� ����������� ����)\n"
 
-#: g10/trustdb.c:1786
+#: g10/trustdb.c:1720
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "���� %08lX.%lu: ���� �������� ����� %s\n"
 
-#: g10/trustdb.c:1794
+#: g10/trustdb.c:1728
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "���� %08lX.%lu: �������� ������� �� �������: %s\n"
 
-#: g10/trustdb.c:2003 g10/trustdb.c:2032 g10/trustdb.c:2771
+#: g10/trustdb.c:1951 g10/trustdb.c:1981 g10/trustdb.c:2734
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr ""
 
-#: g10/trustdb.c:2054
+#: g10/trustdb.c:2003
 #, fuzzy, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "���������� ������� �� �������: %s\n"
 
-#: g10/trustdb.c:2117
+#: g10/trustdb.c:2071
 #, c-format
 msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n"
 msgstr ""
 
-#: g10/trustdb.c:2121
+#: g10/trustdb.c:2075
 #, c-format
 msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n"
 msgstr ""
 
 #. we need the dir record
-#: g10/trustdb.c:2128
+#: g10/trustdb.c:2082
 #, c-format
 msgid "sig rec %lu[%d] in hintlist of %lu does not point to a dir record\n"
 msgstr ""
 
-#: g10/trustdb.c:2134
+#: g10/trustdb.c:2088
 #, c-format
 msgid "lid %lu: no primary key\n"
 msgstr ""
 
-#: g10/trustdb.c:2167
+#: g10/trustdb.c:2121
 #, fuzzy, c-format
 msgid "lid %lu: user id not found in keyblock\n"
 msgstr "%s: ������������ �� ������\n"
 
-#: g10/trustdb.c:2171
+#: g10/trustdb.c:2125
 #, fuzzy, c-format
 msgid "lid %lu: user id without signature\n"
 msgstr "���� %08lX: ��� �������������� ������������ ��� �������\n"
 
-#: g10/trustdb.c:2178
+#: g10/trustdb.c:2132
 #, fuzzy, c-format
 msgid "lid %lu: self-signature in hintlist\n"
 msgstr "build_sigrecs: Selbst-Signatur fehlt\n"
 
-#: g10/trustdb.c:2189 g10/trustdb.c:2910 g10/trustdb.c:2994
+#: g10/trustdb.c:2143 g10/trustdb.c:2879 g10/trustdb.c:2962
 #, fuzzy
 msgid "Valid certificate revocation"
 msgstr "������ ����������"
 
-#: g10/trustdb.c:2190 g10/trustdb.c:2911 g10/trustdb.c:2995
+#: g10/trustdb.c:2144 g10/trustdb.c:2880 g10/trustdb.c:2963
 #, fuzzy
 msgid "Good certificate"
 msgstr "������ ����������"
 
-#: g10/trustdb.c:2199
+#: g10/trustdb.c:2153
 msgid "very strange: no public key\n"
 msgstr ""
 
-#: g10/trustdb.c:2247
+#: g10/trustdb.c:2201
 #, c-format
 msgid "hintlist %lu[%d] of %lu does not point to a dir record\n"
 msgstr ""
 
-#: g10/trustdb.c:2253
+#: g10/trustdb.c:2207
 #, c-format
 msgid "lid %lu does not have a key\n"
 msgstr ""
 
-#: g10/trustdb.c:2263
+#: g10/trustdb.c:2217
 #, fuzzy, c-format
 msgid "lid %lu: can't get keyblock: %s\n"
 msgstr "���������� �������� ���� �����: %s\n"
 
-#: g10/trustdb.c:2320 g10/trustdb.c:3245
+#: g10/trustdb.c:2274 g10/trustdb.c:3227
 #, fuzzy, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "������ �������������: %s\n"
 
-#: g10/trustdb.c:2473
+#: g10/trustdb.c:2427
 #, fuzzy, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "���� %08lX: ��� �������������� ������������\n"
 
-#: g10/trustdb.c:2479 g10/trustdb.c:2521
+#: g10/trustdb.c:2433 g10/trustdb.c:2475
 #, fuzzy, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "���� %08lX: ��� ���������� ��������������� �������������\n"
 
-#: g10/trustdb.c:2494
+#: g10/trustdb.c:2448
 #, fuzzy, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "���� %08lX.%lu: ���� �������� ����� %s\n"
 
-#: g10/trustdb.c:2500
+#: g10/trustdb.c:2454
 #, fuzzy, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "���� %08lX: �������� ���� �� ������: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2469
 #, fuzzy, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "���� %08lX: ��� ���������� ��������������� �������������\n"
 
-#: g10/trustdb.c:2615
+#: g10/trustdb.c:2573
 #, fuzzy
 msgid "Good self-signature"
 msgstr "[����-�������]\n"
 
-#: g10/trustdb.c:2626
+#: g10/trustdb.c:2584
 #, fuzzy
 msgid "Invalid self-signature"
 msgstr "���� %08lX: ������������ ����-�������\n"
 
-#: g10/trustdb.c:2636
+#: g10/trustdb.c:2594
 msgid "Valid user ID revocation skipped due to a newer self signature\n"
 msgstr ""
 
-#: g10/trustdb.c:2643
+#: g10/trustdb.c:2601
 #, fuzzy
 msgid "Valid user ID revocation\n"
 msgstr "������������ �����.\n"
 
-#: g10/trustdb.c:2650
+#: g10/trustdb.c:2608
 #, fuzzy
 msgid "Invalid user ID revocation"
 msgstr "������������ �����.\n"
 
-#: g10/trustdb.c:2734
+#: g10/trustdb.c:2697
 msgid "Too many preferences"
 msgstr ""
 
-#: g10/trustdb.c:2748
+#: g10/trustdb.c:2711
 msgid "Too many preference items"
 msgstr ""
 
-#: g10/trustdb.c:2888
+#: g10/trustdb.c:2857
 #, fuzzy
 msgid "duplicated certificate - deleted"
 msgstr "������ ����������"
 
-#: g10/trustdb.c:2922
+#: g10/trustdb.c:2891
 #, fuzzy
 msgid "Hmmm, public key lost?"
 msgstr "������ �������� ����"
 
-#: g10/trustdb.c:2932 g10/trustdb.c:3015
+#: g10/trustdb.c:2900 g10/trustdb.c:2983
 #, fuzzy
 msgid "Invalid certificate revocation"
 msgstr "������ ����������"
 
-#: g10/trustdb.c:2933 g10/trustdb.c:3016
+#: g10/trustdb.c:2901 g10/trustdb.c:2984
 #, fuzzy
 msgid "Invalid certificate"
 msgstr "������ ����������"
 
-#: g10/trustdb.c:2948
+#: g10/trustdb.c:2916
 #, c-format
 msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n"
 msgstr ""
 
-#: g10/trustdb.c:2962
+#: g10/trustdb.c:2930
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr ""
 
 #. that should never happen
-#: g10/trustdb.c:3215
+#: g10/trustdb.c:3190
 #, fuzzy, c-format
 msgid "insert_trust_record: keyblock not found: %s\n"
 msgstr "���� %08lX: ��������� ���� �� ������: %s\n"
 
-#: g10/trustdb.c:3233
+#: g10/trustdb.c:3215
 msgid "did not use primary key for insert_trust_record()\n"
 msgstr ""
 
-#: g10/ringedit.c:314
+#: g10/ringedit.c:316
 #, fuzzy, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/ringedit.c:320 g10/ringedit.c:1315
+#: g10/ringedit.c:322 g10/ringedit.c:1330
 #, fuzzy, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/ringedit.c:1492
+#: g10/ringedit.c:1507
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/ringedit.c:1493
+#: g10/ringedit.c:1508
 #, fuzzy, c-format
 msgid "%s is the unchanged one\n"
 msgstr "����������� ������������ ��������� ����"
 
-#: g10/ringedit.c:1494
+#: g10/ringedit.c:1509
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/ringedit.c:1495
+#: g10/ringedit.c:1510
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
@@ -3118,12 +3135,12 @@ msgstr "���������� (y/N)? "
 msgid "writing to stdout\n"
 msgstr "������������ � `%s'\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 #, fuzzy, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "���������� ������� ����������� ������ `%s' .\n"
 
-#: g10/openfile.c:192
+#: g10/openfile.c:197
 #, c-format
 msgid "%s: new options file created\n"
 msgstr ""
@@ -3327,9 +3344,6 @@ msgstr "������ ��� `%s' �����������."
 #~ msgid "edit a key signature"
 #~ msgstr "Bearbeiten der Signaturen eines ����s"
 
-#~ msgid "do not make any changes"
-#~ msgstr "Keine wirklichen �nderungen durchf�hren"
-
 #~ msgid ""
 #~ "It's up to you to assign a value here; this value will never be exported\n"
 #~ "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"