Preparing 2.0.4gnupg-2.0.4

author: Werner Koch <[email protected]> 2007-05-09 11:01:33 +0000
committer: Werner Koch <[email protected]> 2007-05-09 11:01:33 +0000
commit: edb3dc99e9833136a7454561d8e0845aa9e55609 (patch)
tree: 112160d61c00df7b476409a698f746b07076e20c
parent: Add a howto section. (diff)
download: gnupg-edb3dc99e9833136a7454561d8e0845aa9e55609.tar.gz
gnupg-edb3dc99e9833136a7454561d8e0845aa9e55609.zip
44 files changed, 2519 insertions, 1922 deletions
diff --git a/ChangeLog b/ChangeLog
index 6ebd0b85b..48177948e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-09  Werner Koch  <[email protected]>
+
+	Released 2.0.4.
+
 2007-05-07  Werner Koch  <[email protected]>
 
 	* configure.ac: Require libgcrypt 1.2.2 to avoid compiler warnings.
diff --git a/NEWS b/NEWS
index c05e165bd..4fe881332 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,8 @@
-Noteworthy changes in version 2.0.4
+Noteworthy changes in version 2.0.4 (2007-05-09)
 ------------------------------------------------
 
- * The Assuan key listing commands are now also working for systems
-   without the funopen/fopencookie API.
+ * The server mode key listing commands are now also working for
+   systems without the funopen/fopencookie API.
 
  * PKCS#12 import now tries several encodings in case the passphrase
    was not utf-8 encoded.  New option --p12-charset for gpgsm.
diff --git a/README b/README
index fc829fee0..d6f9ec5e1 100644
--- a/README
+++ b/README
@@ -71,11 +71,13 @@ DOCUMENTATION
 
 The complete documentation is in the texinfo manual named
 `gnupg.info'.  Run "info gnupg" to read it.  If you want a a printable
-copy of the manual, change to the "doc" directory and enter "make
-gnupg.pdf".  For a HTML version enter "make gnupg.html" and point your
-browser to gnupg.html/index.html.  Standard man pages for all
-components are provided as well.  Watch http://www.gnupg.org for
-updated and new documentation.
+copy of the manual, change to the "doc" directory and enter "make pdf"
+For a HTML version enter "make html" and point your browser to
+gnupg.html/index.html.  Standard man pages for all components are
+provided as well.  An online version of the manual is available at
+http://www.gnupg.org/documentation/manuals/gnupg/ .  A version of the
+manual pertaining to the current development snapshot is at
+http://www.gnupg.org/documentation/manuals/gnupg-devel/ .
 
 
 
@@ -88,7 +90,7 @@ functionality up into several modules.  Both versions may be installed
 simultaneously without any conflict (gpg is called gpg2 in GnuPG 2).
 In fact, the gpg version from GnuPG 1.4 is able to make use of the
 gpg-agent as included in GnuPG 2 and allows for seamless passphrase
-caching.  The advantage of GnupG 1.4 is its smaller size and no
+caching.  The advantage of GnuPG 1.4 is its smaller size and no
 dependency on other modules at run and build time.
 
 
diff --git a/configure.ac b/configure.ac
index ad6d3d280..e2c9c7ed4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ min_automake_version="1.10"
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
 m4_define([my_version], [2.0.4])
-m4_define([my_issvn], [yes])
+m4_define([my_issvn], [no])
 
 
 m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 00ba9cd03..f2d6b05f2 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-09  Werner Koch  <[email protected]>
+
+	* Makefile.am (online): Distinguish between released and svn manuals.
+
 2007-05-08  Werner Koch  <[email protected]>
 
 	* howtos.texi: New.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0a588474f..feb3b7713 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -142,8 +142,13 @@ online: gnupg.html gnupg.pdf
 	set -e; \
 	echo "Uploading current manuals to www.gnupg.org ..."; \
 	cp gnupg-logo.png gnupg.html/; \
-        user=werner ; \
-	(cd gnupg.html && rsync -vr --exclude='.svn' .  \
-	  $${user}@cvs.gnupg.org:webspace/manuals/gnupg/ ); \
-        rsync -v gnupg.pdf $${user}@cvs.gnupg.org:webspace/manuals/
+        user=werner ; dashdevel="" ; \
+        if echo "@PACKAGE_VERSION@" | grep -- "-svn" >/dev/null; then \
+	  dashdevel="-devel" ; \
+	else \
+          rsync -v gnupg.pdf $${user}@cvs.gnupg.org:webspace/manuals/ ; \
+        fi ; \
+	cd gnupg.html ; \
+        rsync -vr --exclude='.svn' .  \
+	  $${user}@cvs.gnupg.org:webspace/manuals/gnupg$${dashdevel}/ 
 
diff --git a/g10/ChangeLog b/g10/ChangeLog
index abd95a54a..49cf5cf19 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-09  Werner Koch  <[email protected]>
+
+	* openfile.c (overwrite_filep, open_outfile) [W32]: Need to use
+	just "nul".  Though, I am pretty sure that some MSDOS versions
+	grok the extra /dev/.
+
 2007-05-07  Werner Koch  <[email protected]>
 
 	* openfile.c (open_outfile, overwrite_filep) [W32]: Use "/dev/nul".
diff --git a/g10/openfile.c b/g10/openfile.c
index d0be66157..008752fb8 100644
--- a/g10/openfile.c
+++ b/g10/openfile.c
@@ -78,7 +78,7 @@ overwrite_filep( const char *fname )
         return 1; /* does not do any harm */
 #endif
 #ifdef HAVE_W32_SYSTEM
-    if ( !strcmp ( fname, "/dev/nul" ) )
+    if ( !strcmp ( fname, "nul" ) )
         return 1;
 #endif
 
@@ -203,7 +203,7 @@ open_outfile( const char *iname, int mode, IOBUF *a )
     if ( opt.dry_run )
       {
 #ifdef HAVE_W32_SYSTEM
-        name = "/dev/nul";
+        name = "nul";
 #else
         name = "/dev/null";
 #endif
diff --git a/m4/ChangeLog b/m4/ChangeLog
index b9c3688ee..b699f4c69 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-09  Werner Koch  <[email protected]>
+
+	* gpg-error.m4, ksba.m4, libassuan.m4, libgcrypt.m4: Updated.
+
 2007-05-07  gettextize  <[email protected]>
 
 	* gettext.m4: Upgrade to gettext-0.16.1.
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
index a5875f004..9d96d1675 100644
--- a/m4/gpg-error.m4
+++ b/m4/gpg-error.m4
@@ -1,4 +1,13 @@
-dnl Autoconf macros for libgpg-error
+# gpg-error.m4 - autoconf macro to detect libgpg-error.
+# Copyright (C) 2002, 2003, 2004 g10 Code GmbH
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This file is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION,
 dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
@@ -42,7 +51,7 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
   if test $ok = yes; then
     GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags`
     GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs`
-    AC_MSG_RESULT(yes)
+    AC_MSG_RESULT([yes ($gpg_error_config_version)])
     ifelse([$2], , :, [$2])
   else
     GPG_ERROR_CFLAGS=""
diff --git a/m4/ksba.m4 b/m4/ksba.m4
index e44b078c2..110038755 100644
--- a/m4/ksba.m4
+++ b/m4/ksba.m4
@@ -75,7 +75,7 @@ AC_DEFUN([AM_PATH_KSBA],
     fi
   fi
   if test $ok = yes; then
-    AC_MSG_RESULT(yes)
+    AC_MSG_RESULT([yes ($ksba_config_version)])
   else
     AC_MSG_RESULT(no)
   fi
diff --git a/m4/libassuan.m4 b/m4/libassuan.m4
index e099b666d..004eee392 100644
--- a/m4/libassuan.m4
+++ b/m4/libassuan.m4
@@ -74,7 +74,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
   fi
 
   if test $ok = yes; then
-    AC_MSG_RESULT(yes)
+    AC_MSG_RESULT([yes ($libassuan_version)])
   else
     AC_MSG_RESULT(no)
   fi
diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
index 20bd10556..854eaaa8c 100644
--- a/m4/libgcrypt.m4
+++ b/m4/libgcrypt.m4
@@ -74,7 +74,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
     fi
   fi
   if test $ok = yes; then
-    AC_MSG_RESULT(yes)
+    AC_MSG_RESULT([yes ($libgcrypt_config_version)])
   else
     AC_MSG_RESULT(no)
   fi
@@ -86,10 +86,10 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
         if test "$tmp" -gt 0 ; then
            AC_MSG_CHECKING([LIBGCRYPT API version])
            if test "$req_libgcrypt_api" -eq "$tmp" ; then
-             AC_MSG_RESULT(okay)
+             AC_MSG_RESULT([okay])
            else
              ok=no
-             AC_MSG_RESULT([does not match (want=$req_libgcrypt_api got=$tmp)])
+             AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp])
            fi
         fi
      fi
diff --git a/po/ChangeLog b/po/ChangeLog
index 3ec5cca53..cf3a9fae1 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-09  Werner Koch  <[email protected]>
+
+	* de.po: Update a few strings.
+
 2007-05-07  gettextize  <[email protected]>
 
 	* Makefile.in.in: Upgrade to gettext-0.16.1.
diff --git a/po/be.po b/po/be.po
index 662e81683..4527c87f2 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
 "PO-Revision-Date: 2003-10-30 16:35+0200\n"
 "Last-Translator: Ales Nyakhaychyk <[email protected]>\n"
 "Language-Team: Belarusian <[email protected]>\n"
@@ -76,8 +76,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr ""
@@ -85,10 +85,10 @@ msgstr ""
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -361,7 +361,7 @@ msgstr "памылка стварэньня \"%s\": %s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
@@ -390,7 +390,7 @@ msgstr "збой падпісаньня: %s\n"
 msgid "listening on socket `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: тэчка створана\n"
@@ -1271,12 +1271,12 @@ msgstr ""
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr ""
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr ""
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
@@ -2675,7 +2675,7 @@ msgstr ""
 msgid "no writable keyring found: %s\n"
 msgstr ""
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr ""
@@ -3635,7 +3635,7 @@ msgstr ""
 msgid "created: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "памылка чытаньня файла"
@@ -3647,7 +3647,7 @@ msgstr "збой падпісаньня: %s\n"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "збой падпісаньня: %s\n"
@@ -3682,12 +3682,12 @@ msgid ""
 msgstr ""
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr ""
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr ""
 
@@ -4676,213 +4676,213 @@ msgstr "немагчыма адкрыць %s: %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr ""
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr ""
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 #, fuzzy
 msgid "no signature found\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 msgid "can't handle this ambiguous signature data\n"
 msgstr ""
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, c-format
 msgid "               using %s key %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 #, fuzzy
 msgid "Key available at: "
 msgstr "Даведка адсутнічае"
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, c-format
 msgid "                aka \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, c-format
 msgid "Signature expired %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature expires %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "невядомая вэрсыя"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 msgid "not a detached signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -4980,40 +4980,40 @@ msgstr ""
 msgid "unknown option `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Файл \"%s\" ужо йснуе. "
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Перазапісаць (y/N)?"
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr ""
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "Увядзіце новае ймя файла"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "запіс у stdout\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr ""
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr ""
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
@@ -6109,19 +6109,19 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
diff --git a/po/ca.po b/po/ca.po
index 0eb7bc7a1..1ef601b3a 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <[email protected]>\n"
 "Language-Team: Catalan <[email protected]>\n"
@@ -98,8 +98,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
@@ -107,10 +107,10 @@ msgstr "no s'ha pogut crear «%s»: %s\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -391,7 +391,7 @@ msgstr "error en crear «%s»: %s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
@@ -420,7 +420,7 @@ msgstr "ha fallat l'actualització: %s\n"
 msgid "listening on socket `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: s'ha creat el directori\n"
@@ -1341,12 +1341,12 @@ msgstr "no podeu usar %s mentre esteu en mode %s\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s xifrat per a: «%s»\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dades xifrades amb %s\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
@@ -2900,7 +2900,7 @@ msgstr "clau %08lX: clau nova - es descarta \n"
 msgid "no writable keyring found: %s\n"
 msgstr "no s'ha trobat cap anell escrivible: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "s'està escrivint en «%s»\n"
@@ -3966,7 +3966,7 @@ msgstr " (sensible)"
 msgid "created: %s"
 msgstr "no s'ha pogut creat %s: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
@@ -3978,7 +3978,7 @@ msgstr " [caduca: %s]"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
@@ -4015,13 +4015,13 @@ msgstr ""
 "correcta a no ser que torneu a executar el programa.\n"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -5103,219 +5103,219 @@ msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "mida extranya per a una clau de sessió xifrada (%d)\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "clau de sessió xifrada amb %s\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "la clau pública és %08lX\n"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr "dades xifrades amb clau pública: bona clau de xifratge (DEK)\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "xifrat amb una clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s\n"
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "xifrat amb una clau %s, ID %08lX\n"
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "ha fallat el desxifratge amb la clau pública: %s\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "xifrat amb %lu contrasenyes\n"
 
 # FIXME WK: Use ngettext
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 msgid "encrypted with 1 passphrase\n"
 msgstr "xifrat amb 1 contrasenya\n"
 
 # I no serà «dades xifrades amb %s»?  ivb
 # Sembla que sí, ho marque per a mirar-ho més endavant. jm
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "s'assumeixen dades xifrades amb %s\n"
 
 # L'optimístic és aquell que té una Fe Cega en que Tot Anirà Bé!  ivb
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "El xifratge IDEA no està disponible, s'intentarà utilitzar optimistament %s "
 "en el seu lloc\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr "desxifratge correcte\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVÍS: el missatge no tenia protecció d'integritat\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVÍS: el missatge xifrat ha estat manipulat!\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitent ha sol·licitat \"alt secret\"\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom del fitxer original='%.*s'\n"
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocació autònoma: useu \"gpg --import\" per a aplicar-la\n"
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr "s'ha eliminat la verificació de signatura\n"
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "no es poden tractar aquestes signatures múltiples\n"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
 # «%.*s» no serà una data?  Caldrà «el» al davant.  ivb
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatura creada el %.*s usant una clau %s ID %08lX\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 msgid "Key available at: "
 msgstr "La clau és disponible en: "
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Signatura INCORRECTA de \""
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signatura caducada de \""
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr "[incert]"
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Aquesta signatura caduca el %s\n"
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 msgid "binary"
 msgstr "binari"
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr "mode text"
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 msgid "unknown"
 msgstr "desconeguda"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "No s'ha pogut comprovar la signatura: %s\n"
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 msgid "not a detached signature\n"
 msgstr "no és una signatura separada\n"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVÍS: s'han detectat múltiples signatures. Només es comprovarà la primera.\n"
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signatura autònoma de classe 0x%02x\n"
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatura de l'estil antic (PGP 2.x)\n"
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "s'ha detectat un paquet arrel invàlid en proc_tree()\n"
 
@@ -5419,41 +5419,41 @@ msgstr "s'estan llegint opcions de «%s»\n"
 msgid "unknown option `%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "El fitxer «%s» existeix. "
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Voleu sobreescriure? (s/N) "
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: el sufix és desconegut\n"
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "Introduïu el nou nom del fitxer"
 
 # Indi?  ivb
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "s'està escrivint en stdout\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "s'asumeix que hi ha dades signades en «%s»\n"
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
@@ -6664,7 +6664,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registre de confiança %lu, tipus %d: no s'ha pogut escriure: %s\n"
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6675,12 +6675,12 @@ msgstr ""
 "ha de ser el primer que figure en la línia d'ordres.\n"
 
 # LF -> fi de línia?  ivb
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "la línia d'entrada %u és massa llarga o hi falta un fí de línia\n"
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
diff --git a/po/cs.po b/po/cs.po
index 7a0183559..9a7c88919 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
 "PO-Revision-Date: 2004-11-26 09:12+0200\n"
 "Last-Translator: Roman Pavlik <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
@@ -78,8 +78,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ochrann� algoritmus %d nen� podporov�n\n"
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
@@ -87,10 +87,10 @@ msgstr "nemohu vytvo�it `%s': %s\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -368,7 +368,7 @@ msgstr "chyba p�i vytv��en� `%s': %s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nemohu vytvo�it adres�� `%s': %s\n"
@@ -397,7 +397,7 @@ msgstr "aktualizace selhala: %s\n"
 msgid "listening on socket `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "adres�� `%s' vytvo�en\n"
@@ -1273,12 +1273,12 @@ msgstr "pou�it� %s nen� v m�du %s dovoleno\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s za�ifrovan� pro: %s\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s za�ifrovan� data\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "za�ifrov�no nezn�m�m algoritmem %d\n"
@@ -2819,7 +2819,7 @@ msgid "no writable keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor kl��� (keyring): %s\n"
 
 # g10/import.c:766 g10/openfile.c:261#, c-format
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisuji do '%s'\n"
@@ -3800,7 +3800,7 @@ msgstr "(citliv� informace)"
 msgid "created: %s"
 msgstr "vytvo�en: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, c-format
 msgid "revoked: %s"
 msgstr "revokov�n: %s"
@@ -3812,7 +3812,7 @@ msgstr "platnost skon�ila: %s"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, c-format
 msgid "expires: %s"
 msgstr "platnost skon��: %s"
@@ -3849,12 +3849,12 @@ msgstr ""
 "b�t nutn� spr�vn�, dokud znova nespust�te program.\n"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "revokov�n"
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "platnost skon�ila"
 
@@ -4884,218 +4884,218 @@ msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "podivn� velikost �ifrovac�ho kl��e pro sezen� (%d)\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s za�ifrovan� kl�� sezen�\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "heslo (passphraze) generov�no s pou�it�m nezn�m�ho algoritmu %d\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, c-format
 msgid "public key is %s\n"
 msgstr "ve�ejn� kl�� je %s\n"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr "data za�ifrov�na ve�ejn�m kl��em: spr�vn� DEK\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "za�ifrov�na %u-bitov�m %s kl��em, ID %s, vytvo�en�m %s\n"
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "za�ifrov�no %s kl��em, ID %s\n"
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "de�ifrov�n� ve�ejn�m kl��em selhalo: %s\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "za�ifrov�no s heslem %lu\n"
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 msgid "encrypted with 1 passphrase\n"
 msgstr "za�ifrov�no jedn�m heslem\n"
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "p�edpokl�d�m %s �ifrovan�ch dat\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "algoritmus IDEA nen� dostupn�; optimisticky se jej pokus�me nahradit "
 "algoritmem %s\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr "de�ifrov�n� o.k.\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROV�N�: zpr�va nebyla chr�n�na proti poru�en� jej� integrity\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROV�N�: se za�ifrovanou zpr�vou bylo manipulov�no!\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "de�ifrov�n� selhalo: %s\n"
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "POZN�MKA: odes�latel po�adoval (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "p�vodn� jm�no souboru='%.*s'\n"
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "samostatn� revoka�n� certifik�t -  pou�ijte \"gpg --import\", chcete-li jej "
 "u��t\n"
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Dobr� podpis od \"%s\""
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr "verifikace podpisu potla�ena\n"
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neum�m pracovat s t�mito n�sobn�mi podpisy\n"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Podpis vytvo�en %s\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               pou�it� %s kl��e %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpis vytvo�en %s pomoc� kl��e %s s ID u�ivatele %s\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 msgid "Key available at: "
 msgstr "Kl�� k dispozici na: "
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "�PATN� podpis od \"%s\""
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypr�enou platnost� od \"%s\""
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobr� podpis od \"%s\""
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr "[nejist�]"
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnost podpisu skon�ila %s\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnost podpisu skon�� %s\n"
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 msgid "binary"
 msgstr "bin�rn� form�t"
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr "textov� form�t"
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 msgid "unknown"
 msgstr "nezn�m� form�t"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemohu ov��it podpis: %s\n"
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 msgid "not a detached signature\n"
 msgstr "toto nen� podpis odd�len� od dokumentu\n"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "VAROV�N�: detekov�no v�ce podpis�. Kontrolov�n bude pouze prvn�.\n"
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis t��dy 0x%02x\n"
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nalezen neplatn� ko�enov� paket v proc_tree()\n"
 
@@ -5192,39 +5192,39 @@ msgstr "nejednozna�n� volby `%s'\n"
 msgid "unknown option `%s'\n"
 msgstr "nezn�m� volba `%s'\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Soubor `%s' existuje. "
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 msgid "Overwrite? (y/N) "
 msgstr "P�epsat (a/N)? "
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: nezn�m� p��pona\n"
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "Vlo�te nov� n�zev souboru"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "zapisuji do standardn�ho v�stupu\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "p�edpokl�d�m podepsan� data v `%s'\n"
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "vytvo�en nov� konfigura�n� soubor `%s'\n"
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "VAROV�N�: nastaven� z `%s' nejsou p�i tomto spu�t�n� zat�m aktivn�\n"
@@ -6368,7 +6368,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "nelze aktualizovat z�znam v datab�zi d�v�ry: chyba p�i z�pisu: %s\n"
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6378,12 +6378,12 @@ msgstr ""
 "Pros�m, nezapome�te, �e soubor s podpisem (.sig nebo .asc)\n"
 "by m�l b�t prvn�m souborem zadan�m na p��kazov� ��dce.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "vstupn� ��dek %u je p��li� dlouh� nebo na konci chyb� znak LF\n"
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
diff --git a/po/da.po b/po/da.po
index 6c16a2589..9738eed87 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
 "PO-Revision-Date: 2003-12-03 16:11+0100\n"
 "Last-Translator: Birger Langkjer <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
@@ -77,8 +77,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
@@ -86,10 +86,10 @@ msgstr "kan ikke oprette %s: %s\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -367,7 +367,7 @@ msgstr "fejl ved l�sning af '%s': %s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
@@ -396,7 +396,7 @@ msgstr "signering fejlede: %s\n"
 msgid "listening on socket `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: mappe oprettet\n"
@@ -1288,12 +1288,12 @@ msgstr ""
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypteret for: %s\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr ""
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
@@ -2721,7 +2721,7 @@ msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 msgid "no writable keyring found: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
@@ -3712,7 +3712,7 @@ msgstr ""
 msgid "created: %s"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "tilf�j n�gle"
@@ -3724,7 +3724,7 @@ msgstr "N�gle udl�ber d. %s\n"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "N�gle udl�ber d. %s\n"
@@ -3759,13 +3759,13 @@ msgid ""
 msgstr ""
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "tilf�j n�gle"
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "udl�b"
@@ -4788,216 +4788,216 @@ msgstr "kan ikke �bne %s: %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s/%s krypteret for: %s\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "ukendt cifferalgoritme "
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "Offentlig n�gle er sl�et fra.\n"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "krypt�r data"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 #, fuzzy
 msgid "no signature found\n"
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 #, fuzzy
 msgid "Key available at: "
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "D�RLIG signatur fra \""
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "ukendt version"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -5096,40 +5096,40 @@ msgstr "l�ser indstillinger fra `%s'\n"
 msgid "unknown option `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Fil `%s' eksisterer. "
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Overskriv (j/N)? "
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: ukendt suffiks\n"
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "Indtast nyt filnavn"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "skriver til stdout\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr ""
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr ""
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
@@ -6255,19 +6255,19 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
diff --git a/po/de.po b/po/de.po
index 0200be571..23d7ff28e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.9.90\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
-"PO-Revision-Date: 2007-03-08 14:30+0100\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"PO-Revision-Date: 2007-05-09 11:14+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgstr "Die PIN ist zu lang"
 
 #: agent/call-pinentry.c:495
 msgid "Passphrase too long"
-msgstr "Das Matra (Passphrase) ist zu lang"
+msgstr "Das Mantra (Passphrase) ist zu lang"
 
 #: agent/call-pinentry.c:503
 msgid "Invalid characters in PIN"
@@ -78,8 +78,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "SSH Schlüssel von mehr als %d Bits werden nicht unterstützt\n"
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
@@ -87,10 +87,10 @@ msgstr "'%s' kann nicht erzeugt werden: %s\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -329,9 +329,9 @@ msgstr "ungültige Debugebene `%s' angegeben\n"
 
 #: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
 #: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
-#, fuzzy, c-format
+#, c-format
 msgid "%s is too old (need %s, have %s)\n"
-msgstr "Die Bibliothek Libksba is nicht aktuell (benötige %s, habe %s)\n"
+msgstr "Die Bibliothek %s ist nicht aktuell (benötige %s, habe %s)\n"
 
 #: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
 #, c-format
@@ -357,7 +357,7 @@ msgstr "Fehler beim Erstellen von `%s': %s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "Verzeichnis `%s' kann nicht erzeugt werden: %s\n"
@@ -386,7 +386,7 @@ msgstr "Der listen()-Aufruf ist fehlgeschlagen: %s\n"
 msgid "listening on socket `%s'\n"
 msgstr "Es wird auf Socket `%s' gehört\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "Verzeichnis `%s' erzeugt\n"
@@ -1278,12 +1278,12 @@ msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s verschlüsselt für: %s\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s verschlüsselte Daten\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Mit unbekanntem Verfahren verschlüsselt %d\n"
@@ -2839,7 +2839,7 @@ msgstr "Schlüssel %s: neuer Schlüssel - übersprungen\n"
 msgid "no writable keyring found: %s\n"
 msgstr "kein schreibbarer Schlüsselbund gefunden: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
@@ -3839,7 +3839,7 @@ msgstr "(empfindlich)"
 msgid "created: %s"
 msgstr "erzeugt: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, c-format
 msgid "revoked: %s"
 msgstr "widerrufen: %s"
@@ -3851,7 +3851,7 @@ msgstr "verfallen: %s"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, c-format
 msgid "expires: %s"
 msgstr "verfällt: %s"
@@ -3888,12 +3888,12 @@ msgstr ""
 "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "widerrufen"
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "verfallen"
 
@@ -4941,216 +4941,216 @@ msgstr "WARNUNG: die URI %s kann nicht geholt werden: %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "WARNUNG: die URI %s kann nicht analysiert werden\n"
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "Seltsame Länge für einen verschlüsselten Sitzungsschlüssel (%d)\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s verschlüsselter Sitzungsschlüssel\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "Passphrase wurde mit unbekanntem Hashverfahren %d erstellt\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, c-format
 msgid "public key is %s\n"
 msgstr "Öffentlicher Schlüssel ist %s\n"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit öffentlichem Schlüssel verschlüsselte Daten: Korrekte DEK\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "verschlüsselt mit %u-Bit %s Schlüssel, ID %s, erzeugt %s\n"
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "verschlüsselt mit %s Schlüssel, ID %s\n"
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschlüsselung mit Public-Key-Verfahren fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Verschlüsselt mit %lu Passphrases\n"
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 msgid "encrypted with 1 passphrase\n"
 msgstr "Verschlüsselt mit einer Passphrase\n"
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "vermutlich %s-verschlüsselte Daten\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA-Verschlüsselung nicht verfügbar; versucht wird stattdessen %s\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr "Entschlüsselung erfolgreich\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 "WARNUNG: Botschaft wurde nicht integritätsgeschützt (integrity protected)\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Warnung: Verschlüsselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Entschlüsselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Ursprünglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "WARNUNG: Mehr als ein Klartext erkannt\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n"
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 msgid "no signature found\n"
 msgstr "Keine Unterschrift gefunden\n"
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-Überprüfung unterdrückt\n"
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 msgid "can't handle this ambiguous signature data\n"
 msgstr "diese mehrdeutige Unterschriftdaten können nicht bearbeitet werden\n"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Unterschrift vom %s\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               mittels %s-Schlüssel %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Unterschrift vom %s mittels %s-Schlüssel ID %s\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 msgid "Key available at: "
 msgstr "Schlüssel erhältlich bei: "
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FALSCHE Unterschrift von \"%s\""
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Verfallene Unterschrift von \"%s\""
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekte Unterschrift von \"%s\""
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr "[ungewiß]  "
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                    alias \"%s\""
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Diese Unterschrift verfällt am %s.\n"
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 msgid "binary"
 msgstr "Binäre"
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr "Textmodus"
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 msgid "unknown"
 msgstr "unbekannt"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht geprüft werden: %s\n"
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 msgid "not a detached signature\n"
 msgstr "keine abgetrennte Unterschrift\n"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "WARNUNG: Mehrfache Signaturen erkannt.  Es wird nur die erste geprüft.\n"
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ungültiges root-Paket in proc_tree() entdeckt\n"
 
@@ -5248,39 +5248,39 @@ msgstr "Mehrdeutige Option '%s'\n"
 msgid "unknown option `%s'\n"
 msgstr "Unbekannte Option '%s'\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Datei '%s' existiert bereits. "
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 msgid "Overwrite? (y/N) "
 msgstr "Überschreiben (j/N)? "
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: unbekannte Dateinamenerweiterung\n"
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "Neuen Dateinamen eingeben"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "Schreiben auf die Standardausgabe\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "die unterzeichneten Daten sind wohl in '%s'\n"
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "Neue Konfigurationsdatei `%s' erstellt\n"
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
@@ -6473,7 +6473,7 @@ msgstr ""
 "\"Trust-DB\"-Versions-Satz kann nicht geändert werden: Schreiben "
 "fehlgeschlagen: %s\n"
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6483,12 +6483,12 @@ msgstr ""
 "Denken Sie daran, daß die Datei mit der Unterschrift (.sig oder .asc)\n"
 "als erster in der Kommandozeile stehen sollte.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "Eingabezeile %u ist zu lang oder es fehlt ein LF\n"
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "fd=%d kann nicht geöffnet werden: %s\n"
@@ -6948,14 +6948,15 @@ msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "Die Zertifikatkette ist länger als von der CA erlaubt (%d)"
 
 #: sm/certcheck.c:103
-#, fuzzy, c-format
+#, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
-msgstr "DSA-Schlüssel %s verwendet einen unsicheren (%u Bit-) Hash\n"
+msgstr "%s-Schlüssel verwendet ein unsicheres (%u-Bit) Hashverfahren\n"
 
 #: sm/certcheck.c:113
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
+"Ein %u-Bit Hashverfahren ist für einen %u-Bit %s Schlüssel nicht möglich\n"
 
 #: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
@@ -7502,7 +7503,7 @@ msgstr "Druckdaten hexkodiert ausgeben"
 
 #: tools/gpg-connect-agent.c:63
 msgid "decode received data lines"
-msgstr ""
+msgstr "Dekodiere empfangene Datenzeilen"
 
 #: tools/gpg-connect-agent.c:64
 msgid "|NAME|connect to Assuan socket NAME"
@@ -7621,7 +7622,7 @@ msgstr "Erlaube PKA Zugriffe (DNS Anfragen)"
 
 #: tools/gpgconf-comp.c:669
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr ""
+msgstr "|NAME|Benutze die Kodierung NAME für PKCS#12 Passphrasen"
 
 #: tools/gpgconf-comp.c:692
 msgid "do not check CRLs for root certificates"
diff --git a/po/el.po b/po/el.po
index 23c36d28b..dfbde4e6f 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
 "PO-Revision-Date: 2003-06-27 12:00+0200\n"
 "Last-Translator: Dokianakis Theofanis <[email protected]>\n"
 "Language-Team: Greek <[email protected]>\n"
@@ -77,8 +77,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
@@ -86,10 +86,10 @@ msgstr "�������� ����������� ��� `%s': %s\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -366,7 +366,7 @@ msgstr "������ ���� �� ���������� ��� `%s': %s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�������� ����������� ��������� `%s': %s\n"
@@ -395,7 +395,7 @@ msgstr "� ��������� �������: %s\n"
 msgid "listening on socket `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: ��������� �������������\n"
@@ -1310,12 +1310,12 @@ msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s ��������������� ���: \"%s\"\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s ��������������� ��������\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "��������������� �� ������� ��������� %d\n"
@@ -2851,7 +2851,7 @@ msgstr "������ %08lX:  ��� ������ - ������������\n"
 msgid "no writable keyring found: %s\n"
 msgstr "��� ������� ��������� ����������: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������� ���  `%s'\n"
@@ -3896,7 +3896,7 @@ msgstr " (���������)"
 msgid "created: %s"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[����������]"
@@ -3908,7 +3908,7 @@ msgstr " [�����: %s]"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [�����: %s]"
@@ -3945,13 +3945,13 @@ msgstr ""
 "����� ��� ��� �������������� �� ���������.\n"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[����������]"
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -5022,214 +5022,214 @@ msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "�������� ������� ��� ��� ������ ���������������� ��������� (%d)\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s ������ ���������������� ��������\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "��������������� �� ������� ��������� %d\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "������� ������ ����� %08lX\n"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr "��������������� �������� �� ������� ������: ���� DEK\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "��������������� �� %u-bit %s ������, ID %08lX, ������������� %s\n"
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "��������������� �� %s key, ID %08lX\n"
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "������������� �� ������� ������ �������: %s\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "��������������� �� %lu ������� �������\n"
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 msgid "encrypted with 1 passphrase\n"
 msgstr "��������������� �� 1 ����� ������\n"
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "������� %s ���������������� ���������\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "��������������� IDEA �� ����������, ��������� ���������� ������ ���\n"
 "%s ��������\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr "���������������� OK\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "WARNING: message was not integrity protected\n"
 msgstr "�������������: ��� ������������� � ����������� ��� ��������\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�������������: �� ��������������� ������ ���� ���������!\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "��������: � ���������� ������ \"���-��-�����-���-����\"\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "������ ����� �������='%.*s'\n"
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "���������� �������� - ��������������� \"gpg --import\" ��� ��������\n"
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 #, fuzzy
 msgid "no signature found\n"
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr "��������� ��������� ���������\n"
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "�������� ��������� ����� ��� ��������� ���������\n"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "�������� ����� ��� %.*s �� ����� ��� ��������%s ID %08lX\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 msgid "Key available at: "
 msgstr "������ ��������� ���: "
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "������� �������� ��� \""
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr "[�������]"
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 msgid "binary"
 msgstr "�������"
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr "���������-��������"
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 msgid "unknown"
 msgstr "�������"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "�������� ������� ��� ���������: %s\n"
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 msgid "not a detached signature\n"
 msgstr "��� ����� ���������� ��������\n"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "�������������: ���������� ��������� ���������. ���� � ����� �� ��������.\n"
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���������� �������� ������ 0x%02x\n"
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�������� ������ ���� (PGP 2.x)\n"
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�� ������ ������(root) ������ ����������� ��� proc_tree()\n"
 
@@ -5329,40 +5329,40 @@ msgstr "�������� �������� ��� `%s'\n"
 msgid "unknown option `%s'\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "�� ������ `%s' ������� ���. "
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "��������� (y/N); "
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: ������� ��������\n"
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "�������������� ��� ��� ����� �������"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "������� ���� stdout\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "������� �������������� ��������� ��� `%s'\n"
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "������������� ��� ������ �������� `%s'\n"
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
@@ -6543,7 +6543,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "������� trust %lu, ����� %d: write �������: %s\n"
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6553,12 +6553,12 @@ msgstr ""
 "�������� ��� ������� ��� �� ������ ��������� (.sig or .asc)\n"
 "������ �� ����� �� ����� ������ ��� ������ �������.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "������ ������� %u ����� ���� ������ � ��� ������ �� LF\n"
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
diff --git a/po/eo.po b/po/eo.po
index 233ceaba6..116e78d65 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
 "Language-Team: Esperanto <[email protected]>\n"
@@ -77,8 +77,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
@@ -86,10 +86,10 @@ msgstr "ne povas krei '%s': %s\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -366,7 +366,7 @@ msgstr "eraro dum kreado de '%s': %s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
@@ -395,7 +395,7 @@ msgstr "aktualigo malsukcesis: %s\n"
 msgid "listening on socket `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: dosierujo kreita\n"
@@ -1302,12 +1302,12 @@ msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s-�ifrita por: %s\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s-�ifritaj datenoj\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "�ifrita per nekonata metodo %d\n"
@@ -2819,7 +2819,7 @@ msgstr "�losilo %08lX: nova �losilo - ignorita\n"
 msgid "no writable keyring found: %s\n"
 msgstr "neniu skribebla �losilaro trovita: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
@@ -3867,7 +3867,7 @@ msgstr " (sentema)"
 msgid "created: %s"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "rev"
@@ -3879,7 +3879,7 @@ msgstr " [eksvalidi�os: %s]"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [eksvalidi�os: %s]"
@@ -3914,13 +3914,13 @@ msgid ""
 msgstr ""
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
@@ -4984,216 +4984,216 @@ msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s-�ifritaj datenoj\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "�ifrita per nekonata metodo %d\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "publika �losilo estas %08lX\n"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr "publik�losile �ifritaj datenoj: bona DEK\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "�ifrita per %u-bita %s-�losilo, %08lX, kreita je %s\n"
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "�ifrita per %s-�losilo, %08lX\n"
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "publik�losila mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supozas %s �ifritajn datenojn\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "�ifro IDEA ne disponata, optimisme provas uzi %s anstata�e\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr "mal�ifrado sukcesis\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: �ifrita mesa�o estis manipulita!\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas mal�altita\n"
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "ne povas trakti �i tiujn pluroblajn subskribojn\n"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Subskribo farita je %.*s per %s, �losilo %08lX\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenia helpo disponata"
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Eksvalidi�inta subskribo de \""
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr "[malcerta]"
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, fuzzy
 msgid "binary"
 msgstr "�efa"
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "nekonata versio"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 msgid "not a detached signature\n"
 msgstr "ne aparta subskribo\n"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
@@ -5292,40 +5292,40 @@ msgstr "legas opciojn el '%s'\n"
 msgid "unknown option `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Dosiero '%s' ekzistas. "
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "�u surskribi (j/N)? "
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: nekonata sufikso\n"
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "Donu novan dosiernomon"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "skribas al la normala eligo\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "supozas subskribitajn datenojn en '%s'\n"
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, fuzzy, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
@@ -6478,7 +6478,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6488,12 +6488,12 @@ msgstr ""
 "Bonvolu memori, ke la subskribodosiero (.sig a� .asc)\n"
 "devas esti la unua dosiero donita en la komandlinio.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "enigata linio %u tro longa, a� mankas linifino\n"
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
diff --git a/po/es.po b/po/es.po
index 76fac3784..c5cfec9d0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
 "PO-Revision-Date: 2005-03-25 16:50+0100\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -99,8 +99,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "el resumen protector %d no puede ser utilizado\n"
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no se puede crear %s: %s\n"
@@ -108,10 +108,10 @@ msgstr "no se puede crear %s: %s\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -387,7 +387,7 @@ msgstr "error creando `%s': %s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no se puede crear el directorio `%s': %s\n"
@@ -416,7 +416,7 @@ msgstr "actualizaci�n fallida: %s\n"
 msgid "listening on socket `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "directorio `%s' creado\n"
@@ -1307,12 +1307,12 @@ msgstr "no puede usar %s en modo %s\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados %s\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado con algoritmo desconocido %d\n"
@@ -2843,7 +2843,7 @@ msgstr "clave %s: clave nueva - omitida\n"
 msgid "no writable keyring found: %s\n"
 msgstr "anillo de claves no escribible encontrado: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
@@ -3819,7 +3819,7 @@ msgstr "(confidencial)"
 msgid "created: %s"
 msgstr "creado: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, c-format
 msgid "revoked: %s"
 msgstr "revocada: %s"
@@ -3831,7 +3831,7 @@ msgstr "caduc�: %s"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, c-format
 msgid "expires: %s"
 msgstr "caduca: %s"
@@ -3868,12 +3868,12 @@ msgstr ""
 "correcta a menos de que reinicie el programa.\n"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "revocada"
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "caducada"
 
@@ -4911,212 +4911,212 @@ msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tama�o anormal para una clave de sesi�n cifrada (%d)\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s clave de sesi�n cifrada\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "frase contrase�a generada con algoritmo de resumen desconocido %d\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, c-format
 msgid "public key is %s\n"
 msgstr "la clave p�blica es %s\n"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados con la clave p�blica: DEK correcta\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrado con clave %2$s de %1$u bits, ID %3$s, creada el %4$s\n"
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado con clave %s, ID %s\n"
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave p�blica fallido: %s\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu frases contrase�a\n"
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 frase contrase�a\n"
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suponiendo %s datos cifrados\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "cifrado IDEA no disponible, confiadamente intentamos usar %s en su lugar\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATENCI�N: la intgridad del mensaje no est� protegida\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCI�N: �el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independiente - use \"gpg --import\" para aplicarla\n"
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Firma correcta de \"%s\""
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificaci�n de la firma\n"
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "no se puede trabajar con firmas m�ltiples\n"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Firmado el %s\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               usando %s clave %s\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Firmado el %s usando clave %s ID %s\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 msgid "Key available at: "
 msgstr "Clave disponible en: "
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma INCORRECTA de \"%s\""
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma caducada de \"%s\""
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma correcta de \"%s\""
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr "[incierto]"
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma caducada en %s\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "firma %s, algoritmo de resumen %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 msgid "binary"
 msgstr "binaria"
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr "modotexto"
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 msgid "unknown"
 msgstr "desconocido"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 msgid "not a detached signature\n"
 msgstr "no es una firma separada\n"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "AVISO: detectadas m�ltiples firmas. S�lo la primera se comprueba.\n"
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma al viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z inv�lido detectado en proc_tree()\n"
 
@@ -5213,39 +5213,39 @@ msgstr "opci�n ambigua `%s'\n"
 msgid "unknown option `%s'\n"
 msgstr "opci�n desconocida `%s'\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "El fichero `%s' ya existe. "
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 msgid "Overwrite? (y/N) "
 msgstr "�Sobreescribir? (s/N) "
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufijo desconocido\n"
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "Introduzca nuevo nombre de fichero"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "escribiendo en stdout\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "asumiendo que hay datos firmados en `%s'\n"
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "creado un nuevo fichero de configuraci�n `%s'\n"
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "AVISO: las opciones en `%s' no est�n a�n activas en esta ejecuci�n\n"
@@ -6400,7 +6400,7 @@ msgstr ""
 "no se puede actualizar el registro de la versi�n de la base de datos\n"
 "de confianza: fallo de escritura: %s\n"
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6410,12 +6410,12 @@ msgstr ""
 "Por favor recuerde que el fichero de firma (.sig o .asc)\n"
 "deber�a ser el primero que se da en la l�nea de �rdenes.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "la l�nea %u es demasiado larga o no tiene avance de l�nea (LF)\n"
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "no se puede abrir `%s': %s\n"
diff --git a/po/et.po b/po/et.po
index 5b04f71ed..d42fd68c3 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
@@ -77,8 +77,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
@@ -86,10 +86,10 @@ msgstr "`%s' ei �nnestu luua: %s\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -365,7 +365,7 @@ msgstr "viga `%s' loomisel: %s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
@@ -394,7 +394,7 @@ msgstr "uuendamine eba�nnestus: %s\n"
 msgid "listening on socket `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: kataloog on loodud\n"
@@ -1301,12 +1301,12 @@ msgstr "%s ei ole moodis %s lubatud.\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s kr�ptitud kasutajale: \"%s\"\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s kr�pteeritud andmed\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
@@ -2818,7 +2818,7 @@ msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
 msgid "no writable keyring found: %s\n"
 msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjutan faili `%s'\n"
@@ -3850,7 +3850,7 @@ msgstr " (tundlik)"
 msgid "created: %s"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[t�histatud] "
@@ -3862,7 +3862,7 @@ msgstr " [aegub: %s]"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [aegub: %s]"
@@ -3899,13 +3899,13 @@ msgstr ""
 "n�idatud v�tme kehtivus olla tingimata korrektne.\n"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[t�histatud] "
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4956,211 +4956,211 @@ msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "veider suurus kr�ptitud sessiooni v�tme jaoks (%d)\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s kr�pteeritud sessiooni v�ti\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "avalik v�ti on %08lX\n"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr "avaliku v�tmega kr�pteeritud andmed: hea DEK\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "kr�pteeritud %u-bitise %s v�tmega, ID %08lX, loodud %s\n"
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "kr�pteeritud %s v�tmega, ID %08lX\n"
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "avaliku v�tmega lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "kr�pteeritud kasutades %lu parooli\n"
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 msgid "encrypted with 1 passphrase\n"
 msgstr "kr�pteeritud �he parooliga\n"
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "eeldan %s kr�pteeritud andmeid\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA �iffer pole saadaval, loodan kasutada selle asemel %s\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr "lahtikr�pteerimine �nnestus\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "WARNING: message was not integrity protected\n"
 msgstr "HOIATUS: teate koosk�lalisus ei ole tagatud\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "HOIATUS: kr�pteeritud teadet on muudetud!\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "M�RKUS: saatja n�udis \"ainult-teie-silmadele\"\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "algne failinimi on='%.*s'\n"
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "eraldiseisev t�histus - realiseerimiseks kasutage \"gpg --import\"\n"
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr "allkirja kontroll j�eti �ra\n"
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neid allkirju ei �nnestu t��delda\n"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Allkirja l�i %.*s kasutades %s v�tit ID %08lX\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 msgid "Key available at: "
 msgstr "V�tme leiate: "
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "HALB allkiri kasutajalt \""
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr "[ebakindel]"
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 msgid "binary"
 msgstr "binaarne"
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr "tekstimood"
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 msgid "unknown"
 msgstr "tundmatu"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 msgid "not a detached signature\n"
 msgstr "ei ole eraldiseisev allkiri\n"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n"
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vana stiili (PGP 2.x) allkiri\n"
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
 
@@ -5259,40 +5259,40 @@ msgstr "loen v�tmeid failist `%s'\n"
 msgid "unknown option `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Fail `%s' on olemas. "
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Kirjutan �le (j/E)? "
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: tundmatu suffiks\n"
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "Sisestage uus failinimi"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "kirjutan standardv�ljundisse\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "eeldan allkirjastatud andmeid failis `%s'\n"
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "uus omaduste fail `%s' on loodud\n"
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
@@ -6447,7 +6447,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "usalduse kirje %lu, t��p %d: kirjutamine eba�nnestus: %s\n"
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6457,12 +6457,12 @@ msgstr ""
 "Palun pidage meeles, et allkirja fail (.sig v�i .asc)\n"
 "peab olema k�sureal esimene fail.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "sisendrida %u on liiga pikk v�i seavahetus puudub\n"
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
diff --git a/po/fi.po b/po/fi.po
index 2d1aff170..9712c277c 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <[email protected]>\n"
 "Language-Team: Finnish <[email protected]>\n"
@@ -93,8 +93,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
@@ -102,10 +102,10 @@ msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -382,7 +382,7 @@ msgstr "virhe luotaessa \"%s\": %s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
@@ -411,7 +411,7 @@ msgstr "päivitys epäonnistui: %s\n"
 msgid "listening on socket `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: hakemisto luotu\n"
@@ -1317,12 +1317,12 @@ msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s salattu vastaanottajalle: \"%s\"\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s salattua dataa\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
@@ -2848,7 +2848,7 @@ msgstr "avain %08lX: uusi avain - ohitetaan\n"
 msgid "no writable keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
@@ -3885,7 +3885,7 @@ msgstr " (luottamuksellinen)"
 msgid "created: %s"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[mitätöity] "
@@ -3897,7 +3897,7 @@ msgstr " [vanhenee: %s]"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [vanhenee: %s]"
@@ -3934,13 +3934,13 @@ msgstr ""
 "ajan tasalla jollet käynnistä ohjelmaa uudelleen\n"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[mitätöity] "
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -5003,217 +5003,217 @@ msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "outo koko salatulle istuntoavaimelle (%d)\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s-salattu istuntoavain\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "julkinen avain on %08lX\n"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr "julkisella avaimella salattu data: DEK kelpaa\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "salattu %u-bittisella %s-avaimella, tunnus %08lX, luotu %s\n"
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "salattu %s-avaimella, tunnus %08lX\n"
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "julkisen avaimen avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "salattu %lu salasanalla\n"
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 msgid "encrypted with 1 passphrase\n"
 msgstr "salattu yhdellä salasanalla\n"
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "oletettavasti %s-salattua dataa\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA-salain ei käytettävissä, yritetään optimistisesti \n"
 "käyttää sen sijaan salainta %s\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr "avaus onnistui\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROITUS: viestin eheyttä ei oltu suojattu\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROITUS: salattua viestiä on muokattu!\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "HUOM: lähettäjä määrittää \"vain-sinun-silmillesi\"\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "alkuperäisen tiedoston nimi=\"%.*s\"\n"
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "itsenäinen mitätöinti - käytä \"gpg --import\" ottaaksesi käyttöön\n"
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr "allekirjoituksen varmistus vaiennetaan\n"
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "näitä allekirjoituksia ei voi käsitellä\n"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 "Allekirjoitus tehty %.*s käyttämällä %s-algoritmia avaintunnuksella %08lX\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 msgid "Key available at: "
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "VÄÄRÄ allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Vanhentunut allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr "[ei tiedossa]"
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \""
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Allekirjoitus vanhenee %s\n"
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 msgid "binary"
 msgstr "binääri"
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr "teksti"
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 msgid "unknown"
 msgstr "tuntematon "
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 msgid "not a detached signature\n"
 msgstr "allekirjoitus ei ole erillinen\n"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "VAROITUS: useita allekirjoituksia havaittu.  Vain ensimmäisen voi "
 "tarkistaa.\n"
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "epäkelpo juuripaketti havaittu proc_tree():ssä\n"
 
@@ -5313,40 +5313,40 @@ msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 msgid "unknown option `%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Tiedosto \"%s\" on olemassa."
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Ylikirjoita (k/E)? "
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: tuntematon pääte\n"
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "Syötä uusi tiedostonimi"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "kirjoitetaan vakiotulosteeseen\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "data kohteessa \"%s\" oletetaan allekirjoitetuksi\n"
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "uusi asetustiedosto \"%s\" luotu\n"
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
@@ -6524,7 +6524,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6534,12 +6534,12 @@ msgstr ""
 "Muista, että allekirjoitustiedosto (.sig tai .asc)\n"
 "tulee antaa komentorivillä ensimmäisenä.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "syöterivi %u on liian pitkä tai rivinvaihto puutuu\n"
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
diff --git a/po/fr.po b/po/fr.po
index 1cebd3dbf..68f2b12de 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
 "PO-Revision-Date: 2005-06-28 00:24+0200\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -82,8 +82,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "le hachage de protection %d n'est pas support�\n"
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
@@ -91,10 +91,10 @@ msgstr "impossible de cr�er `%s': %s\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -378,7 +378,7 @@ msgstr "erreur pendant la cr�ation de `%s': %s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "impossible de cr�er le r�pertoire `%s': %s\n"
@@ -409,7 +409,7 @@ msgstr "la mise � jour a �chou�: %s\n"
 msgid "listening on socket `%s'\n"
 msgstr "�criture de la cl� secr�te dans `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "r�pertoire `%s' cr��\n"
@@ -1302,12 +1302,12 @@ msgstr "vous ne pouvez pas utiliser %s en mode %s.\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s chiffr� pour: \"%s\"\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "donn�es chiffr�es avec %s\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "chiffr� avec l'algorithme inconnu %d\n"
@@ -2877,7 +2877,7 @@ msgstr "cl� %s: nouvelle cl� - ignor�e\n"
 msgid "no writable keyring found: %s\n"
 msgstr "aucun porte-cl� n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
@@ -3885,7 +3885,7 @@ msgstr "(sensible)"
 msgid "created: %s"
 msgstr "cr��: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, c-format
 msgid "revoked: %s"
 msgstr "revoqu�: %s"
@@ -3897,7 +3897,7 @@ msgstr "expir�: %s"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, c-format
 msgid "expires: %s"
 msgstr "expire: %s"
@@ -3934,12 +3934,12 @@ msgstr ""
 "correcte tant que vous n'avez pas relanc� le programme.\n"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "revoqu�e"
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "expir�e"
 
@@ -5011,199 +5011,199 @@ msgstr ""
 "AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
 "via %s: %s\n"
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "taille �tonnante pour une cl� de session chiffr�e (%d)\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "cl� de session chiffr�e %s\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "phrase de passe g�n�r�e avec l'algorithme de hachage %d inconnu\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, c-format
 msgid "public key is %s\n"
 msgstr "la cl� publique est %s\n"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr "donn�es chiffr�es par cl� publique: bonne cl� de chiffrement (DEK)\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "chiffr� avec une cl� de %u bits %s, ID %s, cr��e le %s\n"
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      � %s �\n"
 
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "chiffr� avec une cl� %s, ID %s\n"
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "le d�chiffrement par cl� publique a �chou�: %s\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "chiffr� avec %lu phrases de passe\n"
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 msgid "encrypted with 1 passphrase\n"
 msgstr "chiffr� avec 1 phrase de passe\n"
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "on suppose des donn�es chiffr�es avec %s\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "L'algorithme IDEA n'est pas disponible, avec un peu de chance %s marchera\n"
 "peut-�tre\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr "le d�chiffrement a r�ussi\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTISSEMENT: l'int�grit� du message n'�tait pas prot�g�e\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTISSEMENT: le message chiffr� a �t� manipul� !\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le d�chiffrement a �chou�: %s\n"
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE: l'exp�diteur a demand� �pour vos yeux seulement�\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original: '%.*s'\n"
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "r�vocation autonome - utilisez �gpg --import� pour l'appliquer\n"
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Bonne signature de � %s �"
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr "v�rification de signature supprim�e\n"
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "le traitement de ces signatures multiples est impossible\n"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature faite le %s\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               en utilisant la cl� %s %s\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signature faite le %s avec la cl� %s ID %s\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 msgid "Key available at: "
 msgstr "Cl� disponible sur: "
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MAUVAISE signature de � %s �"
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature expir�e de � %s �"
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bonne signature de � %s �"
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr "[incertain]"
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias � %s �"
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "La signature a expir� le %s\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 msgid "binary"
 msgstr "binaire"
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr "modetexte"
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 msgid "unknown"
 msgstr "inconnu"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de v�rifier la signature: %s\n"
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 msgid "not a detached signature\n"
 msgstr "la signature n'est pas d�tach�e\n"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
@@ -5211,16 +5211,16 @@ msgstr ""
 "premi�re\n"
 "sera v�rifi�e.\n"
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
@@ -5325,39 +5325,39 @@ msgstr "option ambigu� `%s'\n"
 msgid "unknown option `%s'\n"
 msgstr "option `%s' inconnue\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Le fichier `%s' existe. "
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 msgid "Overwrite? (y/N) "
 msgstr "R��crire par-dessus ? (o/N) "
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: suffixe inconnu\n"
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "Entrez le nouveau nom de fichier"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "�criture vers la sortie standard\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, 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:387
+#: g10/openfile.c:397
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr " nouveau fichier de configuration `%s' cr��\n"
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
@@ -6552,7 +6552,7 @@ msgstr ""
 "impossible de mettre � jour l'enregistrement de version de la\n"
 "base de confiance: l'�criture a �chou�: %s\n"
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6562,14 +6562,14 @@ msgstr ""
 "Rappelez-vous bien que le fichier de signature (.sig ou .asc)\n"
 "doit �tre le premier fichier indiqu� sur la ligne de commande.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 "la ligne d'entr�e %u est trop longue ou il manque un caract�re de saut\n"
 "de ligne\n"
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
diff --git a/po/gl.po b/po/gl.po
index cd9d2d50c..bbdf4ed5d 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <[email protected]>\n"
 "Language-Team: Galician <[email protected]>\n"
@@ -77,8 +77,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
@@ -86,10 +86,10 @@ msgstr "non se pode crear `%s': %s\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -370,7 +370,7 @@ msgstr "erro ao crear `%s': %s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
@@ -399,7 +399,7 @@ msgstr "a actualizaci�n fallou: %s\n"
 msgid "listening on socket `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directorio creado\n"
@@ -1310,12 +1310,12 @@ msgstr "non se pode empregar %s no modo %s\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados con %s\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado cun algoritmo desco�ecido %d\n"
@@ -2832,7 +2832,7 @@ msgstr "chave %08lX: nova chave - omitida\n"
 msgid "no writable keyring found: %s\n"
 msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribindo a `%s'\n"
@@ -3882,7 +3882,7 @@ msgstr " (sensible)"
 msgid "created: %s"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada] "
@@ -3894,7 +3894,7 @@ msgstr " [caduca: %s]"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
@@ -3931,13 +3931,13 @@ msgstr ""
 "correcta a menos que reinicie o programa.\n"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada] "
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -5006,212 +5006,212 @@ msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tama�o moi estra�o para unha chave de sesi�n cifrada (%d)\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "chave de sesi�n cifrada con %s\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrado cun algoritmo desco�ecido %d\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados coa chave p�blica: DEK correcto\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrado cunha chave de %u bits, %s, ID %08lX, creado o %s\n"
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado cunha chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "fallou o descifrado de chave p�blica: %s\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu contrasinais\n"
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 contrasinal\n"
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supo�endo datos cifrados con %s\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "A cifra IDEA non est� dispo�ible, t�ntase empregar %s no seu canto\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: a mensaxe non ti�a protecci�n de integridade\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVISO: �a mensaxe cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remitente pediu \"confidencial\"\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro orixinal='%.*s'\n"
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independente - empregue \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr "verificaci�n de sinatura suprimida\n"
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "non se poden manexar estas sinaturas m�ltiples\n"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Sinatura feita o %.*s usando %s coa chave de ID %08lX\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 msgid "Key available at: "
 msgstr "Chave dispo�ible en: "
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Sinatura INCORRECTA de\""
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Sinatura caducada de \""
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               alias \""
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr "modo texto"
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 msgid "unknown"
 msgstr "desco�ecido"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Non foi posible verifica-la sinatura: %s\n"
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 msgid "not a detached signature\n"
 msgstr "non � unha sinatura separada\n"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVISO: detect�ronse sinaturas m�ltiples. S� se ha comproba-la primeira.\n"
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "sinatura independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Sinatura � vello estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z incorrecto detectado en proc_tree()\n"
 
@@ -5312,40 +5312,40 @@ msgstr "lendo as opci�ns de `%s'\n"
 msgid "unknown option `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "O ficheiro `%s' xa existe. "
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "�Sobrescribir? (s/N) "
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufixo desco�ecido\n"
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "Introduza o novo nome de ficheiro"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "escribindo na sa�da est�ndar\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "suponse que hai datos asinados en `%s'\n"
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "AVISO: as opci�ns de `%s' a�nda non est�n activas nesta execuci�n\n"
@@ -6522,7 +6522,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6532,13 +6532,13 @@ msgstr ""
 "Por favor, lembre que o ficheiro de sinatura (.sig ou .asc) deber�a\n"
 "se-lo primeiro ficheiro que se indique na li�a de comandos.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 "a li�a de entrada %u � longa de m�is ou f�ltalle a marca de fin de li�a\n"
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "non se puido abrir `%s': %s\n"
diff --git a/po/hu.po b/po/hu.po
index c042a9cac..c88c12ae7 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
 "PO-Revision-Date: 2004-06-19 21:53+0200\n"
 "Last-Translator: Nagy Ferenc L�szl� <[email protected]>\n"
 "Language-Team: Hungarian <[email protected]>\n"
@@ -77,8 +77,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
@@ -86,10 +86,10 @@ msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -365,7 +365,7 @@ msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
@@ -394,7 +394,7 @@ msgstr "Friss�t�s sikertelen: %s.\n"
 msgid "listening on socket `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: K�nyvt�rat l�trehoztam.\n"
@@ -1298,12 +1298,12 @@ msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s titkos�tva \"%s\" sz�m�ra\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s titkos�tott adat.\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
@@ -2823,7 +2823,7 @@ msgstr "%08lX kulcs: �j kulcs - kihagytam.\n"
 msgid "no writable keyring found: %s\n"
 msgstr "Nem �rhat� kulcskarik�t tal�ltam: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
@@ -3858,7 +3858,7 @@ msgstr " (�rz�keny)"
 msgid "created: %s"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[visszavont] "
@@ -3870,7 +3870,7 @@ msgstr " [lej�r: %s]"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [lej�r: %s]"
@@ -3907,13 +3907,13 @@ msgstr ""
 "felt�tlen�l helyes, am�g �jra nem ind�tja a programot!\n"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[visszavont] "
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4977,214 +4977,214 @@ msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "Furcsa m�ret� (%d) titkos�tott munkafolyamatkulcs.\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s titkos�tott munkafolyamatkulcs\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "Nyilv�nos kulcs: %08lX\n"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr "Nyilv�nos kulccsal titkos�tott adat: j� DEK.\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "Titkos�tva %u bites %s kulccsal, azonos�t�: %08lX, l�trehozva: %s\n"
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Titkos�tva %s kulccsal, azonos�t�: %08lX\n"
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Nyilv�nos kulcs� visszafejt�s sikertelen: %s\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu jelsz�val rejtjelezve\n"
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 jelsz�val rejtjelezve\n"
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s titkos�tott adatot felt�telezek.\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA rejtjelez� nem �ll rendelkez�sre, optimista m�don megpr�b�lok\n"
 "%s-t haszn�lni helyette.\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr "Visszafejt�s rendben.\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "WARNING: message was not integrity protected\n"
 msgstr "FIGYELEM: Az �zenetet nem l�tt�k el integrit�sv�delemmel.\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "FIGYELEM: A titkos�tott �zenetet manipul�lt�k!\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "MEGJEGYZ�S: A felad� k�r�se: \"csak az �n szemeinek\".\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Eredeti f�jln�v: '%.*s'.\n"
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "K�l�n�ll� visszavon�s. Haszn�lja a \"gpg --import\"-ot az alkalmaz�s�hoz!\n"
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 #, fuzzy
 msgid "no signature found\n"
 msgstr "J� al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr "Al��r�s-ellen�rz�s elnyomva.\n"
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "Nem tudom kezelni ezeket a t�bbsz�r�s al��r�sokat!\n"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Al��rva: %.*s; kulcs: %s, %08lX.\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 msgid "Key available at: "
 msgstr "Kulcs tal�lhat�: "
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ROSSZ al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Lej�rt al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "J� al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr "[bizonytalan]"
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Az al��r�s lej�r: %s.\n"
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 msgid "binary"
 msgstr "Bin�ris"
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr "Sz�vegm�d�"
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 msgid "unknown"
 msgstr "Ismeretlen m�d�"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem tudom ellen�rizni az al��r�st: %s.\n"
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 msgid "not a detached signature\n"
 msgstr "Nem k�l�n�ll� al��r�s.\n"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "FIGYELEM: T�bbsz�r�s al��r�st �rz�keltem. Csak az els�t ellen�rz�m.\n"
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x oszt�ly� k�l�n�ll� al��r�s.\n"
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr "R�gi st�lus� (PGP 2.x) al��r�s.\n"
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�rv�nytelen gy�k�rcsomagot tal�ltam a proc_tree() f�ggv�nyben!\n"
 
@@ -5284,40 +5284,40 @@ msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 msgid "unknown option `%s'\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "\"%s\" �llom�ny l�tezik. "
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Fel�l�rjam (i/N)? "
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: ismeretlen v�gz�d�s.\n"
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "�rja be az �j �llom�nynevet"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "�rok a szabv�nyos kimenetre.\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "Azt felt�telezem, hogy az al��rt adat a %s �llom�nyban van.\n"
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "\"%s\" �j konfigur�ci�s �llom�nyt l�trehoztam.\n"
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
@@ -6487,7 +6487,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "%lu bizalmi rekord, %d t�pus: �r�s sikertelen: %s.\n"
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6497,12 +6497,12 @@ msgstr ""
 "Ne felejtse el, hogy az al��r�st tartalmaz� �llom�nyt (.sig vagy .asc)\n"
 "kell az els� helyre �rni a parancssorban!\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "A bemeneti sor (%u) t�l hossz�, vagy hi�nyzik a soremel�s.\n"
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
diff --git a/po/id.po b/po/id.po
index f08f43d7b..f504dfb19 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <[email protected]>\n"
 "Language-Team: Indonesian <[email protected]>\n"
@@ -79,8 +79,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
@@ -88,10 +88,10 @@ msgstr "tidak dapat membuat %s: %s\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -367,7 +367,7 @@ msgstr "kesalahan penciptaan : `%s': %s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
@@ -396,7 +396,7 @@ msgstr "gagal memperbarui: %s\n"
 msgid "listening on socket `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: direktori tercipta\n"
@@ -1303,12 +1303,12 @@ msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s dienkripsi untuk: %s\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s data terenkripsi\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
@@ -2839,7 +2839,7 @@ msgstr "kunci %08lX: kunci baru - dilewati\n"
 msgid "no writable keyring found: %s\n"
 msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
@@ -3875,7 +3875,7 @@ msgstr " (sensitive)"
 msgid "created: %s"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revoked] "
@@ -3887,7 +3887,7 @@ msgstr " [berakhir: %s]"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [berakhir: %s]"
@@ -3924,13 +3924,13 @@ msgstr ""
 "kecuali anda memulai kembali program.\n"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[revoked] "
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4990,212 +4990,212 @@ msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "ukuran aneh untuk kunci sesi terenkripsi (%d)\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s kunci sesi enkripsi\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "kunci publik adalah %08lX\n"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "dienkripsi dengan %u-bit kunci %s, ID %08lX, tercipta %s\n"
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "dienkripsi dengan passphrase %lu\n"
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 msgid "encrypted with 1 passphrase\n"
 msgstr "dienkripsi dengan 1 passphrase\n"
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "asumsikan %s data terenkripsi\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cipher IDEA tidak tersedia, secara optimis berusaha menggunakan %s\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "WARNING: message was not integrity protected\n"
 msgstr "PERINGATAN: integritas pesan tidak terlindungi\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak diabaikan\n"
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "tidak dapat menangani banyak signature ini\n"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signature membuat %.*s menggunakan kunci %s ID %08lX\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 msgid "Key available at: "
 msgstr "Kunci tersedia di:"
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature kadaluarsa dari \""
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 msgid "binary"
 msgstr "biner"
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr "modeteks"
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 msgid "unknown"
 msgstr "tidak dikenal"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 msgid "not a detached signature\n"
 msgstr "bukan detached signature\n"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "PERINGATAN: multi signature terdeteksi. Hanya yang pertama akan diperiksa.\n"
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature mandiri 0x%02x\n"
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
@@ -5293,40 +5293,40 @@ msgstr "membaca pilihan dari `%s'\n"
 msgid "unknown option `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "File `%s' ada. "
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Ditimpa (y/T)? "
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: suffix tidak dikenal\n"
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "Masukkan nama file baru"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "menulis ke stdout\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "mengasumsikan data bertanda dalam `%s'\n"
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "file konfigurasi baru `%s' tercipta\n"
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "PERINGATAN: opsi dalam `%s' belum aktif selama pelaksanaan ini\n"
@@ -6490,7 +6490,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6500,12 +6500,12 @@ msgstr ""
 "Tolong ingat bahwa file signature (.sig atau .asc)\n"
 "haruslah file pertama yang diberikan pada perintah baris.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "baris input %u terlalu panjang atau hilang LF\n"
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
diff --git a/po/it.po b/po/it.po
index 5afd75176..683020163 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
 "PO-Revision-Date: 2004-06-16 17:01+0200\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -77,8 +77,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
@@ -86,10 +86,10 @@ msgstr "impossibile creare `%s': %s\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -365,7 +365,7 @@ msgstr "errore creando `%s': %s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "impossibile creare la directory `%s': %s\n"
@@ -394,7 +394,7 @@ msgstr "aggiornamento fallito: %s\n"
 msgid "listening on socket `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directory creata\n"
@@ -1310,12 +1310,12 @@ msgstr "non � possibile usare %s in modalit� %s\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrato per: \"%s\"\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dati cifrati con %s\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
@@ -2846,7 +2846,7 @@ msgstr "chiave %08lX: nuova chiave - saltata\n"
 msgid "no writable keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
@@ -3883,7 +3883,7 @@ msgstr " (sensibile)"
 msgid "created: %s"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocata]"
@@ -3895,7 +3895,7 @@ msgstr "[scadenza: %s]"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[scadenza: %s]"
@@ -3933,13 +3933,13 @@ msgstr ""
 "finch� non eseguirai di nuovo il programma.\n"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[revocata]"
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -5012,211 +5012,211 @@ msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "la chiave di sessione cifrata ha dimensioni strane (%d)\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "chiave di sessione cifrata con %s\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "la chiave pubblica � %08lX\n"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrato con la chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s\n"
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                alias \""
 
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Cifrato con la chiave %s con ID %08lX\n"
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifratto con %lu passphrase\n"
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifratto con 1 passphrase\n"
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suppongo che i dati siano cifrati con %s\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cifrario IDEA non disponibile, ottimisticamente cerco di usare %s\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATTENZIONE: l'integrit� del messaggio non era protetta\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato � stato manipolato!\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "impossibile gestire queste firme multiple\n"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                alias \""
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Firma fatta %.*s usando %s con ID %08lX\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 msgid "Key available at: "
 msgstr "Chiave disponibile presso: "
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma scaduta da \""
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr "[incerta]"
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Questa firma scadr� il %s\n"
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr "modo testo"
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 msgid "not a detached signature\n"
 msgstr "non � una firma separata\n"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "ATTENZIONE: trovate firme multiple. Sar� controllata solo la prima.\n"
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
@@ -5315,40 +5315,40 @@ msgstr "lettura delle opzioni da `%s'\n"
 msgid "unknown option `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Il file `%s' esiste. "
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Sovrascrivo (s/N)? "
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: suffisso sconosciuto\n"
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "Inserire il nuovo nome del file"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "scrivo su stdout\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "suppongo che i dati firmati siano in `%s'\n"
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "creato un nuovo file di configurazione `%s'\n"
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
@@ -6538,7 +6538,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, req type %d: write fallita: %s\n"
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6548,12 +6548,12 @@ msgstr ""
 "Ricorda che il file con la firma (.sig or .asc) deve\n"
 "essere il primo file indicato sulla riga di comando.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linea di input %u troppo lunga o LF mancante\n"
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
diff --git a/po/ja.po b/po/ja.po
index 3f165cf32..135a2c9e3 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
 "PO-Revision-Date: 2004-11-23 11:14+0900\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -80,8 +80,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
@@ -89,10 +89,10 @@ msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -368,7 +368,7 @@ msgstr "��%s�פκ������顼: %s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
@@ -397,7 +397,7 @@ msgstr "�����˼��Ԥ��ޤ���: %s\n"
 msgid "listening on socket `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ��Ǥ��ޤ���\n"
@@ -1268,12 +1268,12 @@ msgstr "%s��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s�Ź沽 ������:��%s��\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s�Ź沽�Ѥߥǡ���\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "̤�ΤΥ��르�ꥺ��%d�ˤ��Ź沽\n"
@@ -2776,7 +2776,7 @@ msgstr "��%s: ���������Ǥ� - �ȤФ��ޤ�\n"
 msgid "no writable keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ��ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "��%s�פؤν����\n"
@@ -3768,7 +3768,7 @@ msgstr "(�ǥꥱ����)"
 msgid "created: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, c-format
 msgid "revoked: %s"
 msgstr "����: %s"
@@ -3780,7 +3780,7 @@ msgstr "��λ: %s"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, c-format
 msgid "expires: %s"
 msgstr "��λ: %s"
@@ -3817,12 +3817,12 @@ msgstr ""
 "�Ȥ������Ȥ�ǰƬ�ˤ����Ƥ���������\n"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "����"
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "��λ"
 
@@ -4850,211 +4850,211 @@ msgstr "�ٹ�: ��%s��%s��ͳ�ǲ����Ǥ��ޤ���: %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�ǲ����Ǥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "�Ѥ�Ĺ���ΰŹ沽�Ѥߥ��å���� (%d)\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s �Ź沽�Ѥߥ��å����\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "̤�Τ����󥢥르�ꥺ����������줿�ѥ��ե졼�� %d\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, c-format
 msgid "public key is %s\n"
 msgstr "��������%s�Ǥ�\n"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr "�������ˤ��Ź沽�Ѥߥǡ���: ������DEK�Ǥ�\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "%u-�ӥå�%s��, ID %s, ����%s�˰Ź沽����ޤ���\n"
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      ��%s��\n"
 
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "%s��, ID %s�ǰŹ沽����ޤ���\n"
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "������������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu �ĤΥѥ��ե졼���ǰŹ沽\n"
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 �ĤΥѥ��ե졼���ǰŹ沽\n"
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s�Ź沽�Ѥߥǡ�������\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA�Ź�ˡ��������ǽ�ʤΤǡ���ŷŪ�Ǥ���%s�����Ѥ��褦�Ȥ��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr "���������\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "WARNING: message was not integrity protected\n"
 msgstr "�ٹ�: ��å������δ��������ݸ��Ƥ��ޤ���\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�ٹ�: �Ź沽���줿��å������ϲ��⤵��Ƥ��ޤ�!\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "����: �����Ԥϡ����ˤ���ɤ褦�˵��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "���Υե�����̾='%.*s'\n"
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "��Ω��������gpg --import�ɤ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 #, fuzzy
 msgid "no signature found\n"
 msgstr "��%s�ɤ������������̾"
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr "��̾�θ��ڤ��ά\n"
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "����¿�Ž�̾�ϼ�갷���ޤ���\n"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, c-format
 msgid "Signature made %s\n"
 msgstr "%s�˻ܤ��줿��̾\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s��%s�����\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "%s��%s��ID %s�ǻܤ��줿��̾\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 msgid "Key available at: "
 msgstr "�ʲ��˸�������ޤ�: "
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "��%s�ɤ���� ������ ��̾"
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "��%s�ɤ���δ����ڤ�ν�̾"
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "��%s�ɤ������������̾"
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr "[�Գ���]"
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                ��̾��%s��"
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "�����ڤ�ν�̾ %s\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "���ν�̾��%s����λ�Ǥ�\n"
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 msgid "binary"
 msgstr "�Х��ʥ꡼"
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr "�ƥ����ȥ⡼��"
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 msgid "unknown"
 msgstr "̤�Τ�"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "��̾�򸡺��Ǥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 msgid "not a detached signature\n"
 msgstr "ʬΥ��̾�Ǥ���ޤ���\n"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "�ٹ�: ¿�Ž�̾�θ��С��ǽ�Τ�Τ����������ޤ���\n"
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���饹0x%02x����Ω��̾\n"
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() �����̵���ʥ롼�ȡ��ѥ��åȤ򸡽Ф��ޤ���\n"
 
@@ -5151,39 +5151,39 @@ msgstr "�����ޤ��ʥ��ץ�����%s��\n"
 msgid "unknown option `%s'\n"
 msgstr "̤�ΤΥ��ץ�����%s��\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "�ե������%s�פϴ���¸�ߤ��ޤ���"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 msgid "Overwrite? (y/N) "
 msgstr "��񤭤��ޤ���? (y/N) "
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: ̤�Τγ�ĥ��\n"
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "�������ե�����̾�����Ϥ��Ƥ�������"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "ɸ����Ϥ˽񤭹��ߤޤ�\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "��̾���줿�ǡ�������%s�פˤ�������ꤷ�ޤ�\n"
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "�����������ե������%s�פ��Ǥ��ޤ���\n"
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "�ٹ�: ��%s�פΥ��ץ����ϵ�ư���Ƥ���֡�ͭ���ˤʤ�ޤ���\n"
@@ -6301,7 +6301,7 @@ msgstr ""
 "���ѥǡ����١����ΥС�����󡦥쥳���ɤ������Ǥ��ޤ���: ����ߤ˼��Ԥ��ޤ�"
 "��: %s\n"
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6311,12 +6311,12 @@ msgstr ""
 "(.sig��.asc)�����ޥ�ɹԤκǽ�Ǥʤ����\n"
 "�ʤ�ʤ����Ȥ�ǰƬ�ˤ����Ƥ���������\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "���Ϥ�%u���ܤ�Ĺ�����뤫��LF���ʤ��褦�Ǥ�\n"
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
diff --git a/po/nb.po b/po/nb.po
index 3fbd7de8c..32286c1f8 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.3\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
 "PO-Revision-Date: 2006-06-13 20:31+0200\n"
 "Last-Translator: Trond Endrest�l <[email protected]>\n"
 "Language-Team: Norwegian Bokm�l <[email protected]>\n"
@@ -80,8 +80,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
@@ -89,10 +89,10 @@ msgstr "kan ikke opprette �%s�: %s\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -368,7 +368,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
@@ -397,7 +397,7 @@ msgstr "oppdatering mislyktes: %s\n"
 msgid "listening on socket `%s'\n"
 msgstr "skriver hemmelig n�kkel til �%s�\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen �%s� ble opprettet\n"
@@ -1267,12 +1267,12 @@ msgstr "du kan ikke bruke %s i %s modus\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s kryptert for: \"%s\"\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s krypterte data\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "kryptert med en ukjent algoritme %d\n"
@@ -2702,7 +2702,7 @@ msgstr "n�kkel %s: ny n�kkel - hoppet over\n"
 msgid "no writable keyring found: %s\n"
 msgstr "ingen skrivbart n�kkelknippe funnet: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til �%s�\n"
@@ -3654,7 +3654,7 @@ msgstr "(sensitiv)"
 msgid "created: %s"
 msgstr "opprettet: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, c-format
 msgid "revoked: %s"
 msgstr "opphevet: %s"
@@ -3666,7 +3666,7 @@ msgstr "utgikk: %s"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, c-format
 msgid "expires: %s"
 msgstr "utg�r: %s"
@@ -3701,12 +3701,12 @@ msgid ""
 msgstr ""
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "opphevet"
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "utg�tt"
 
@@ -4736,211 +4736,211 @@ msgstr "ADVARSEL: klarte ikke � fange URI %s: %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ADVARSEL: klarte ikke � parse URI %s\n"
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "merkelig st�rrelse for en kryptert sesjonsn�kkel (%d)\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr ""
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "passfrase er generert med en ukjent digest-algoritme %d\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, c-format
 msgid "public key is %s\n"
 msgstr "offentlig n�kkel er %s\n"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr "offentlig n�kkel-kryptert data: god DEK\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "kryptert med %u-bit %s-n�kkel, ID %s, opprettet %s\n"
 
 # Do we really need to translate this string.
 # The must some bug in the code.
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      �%s�\n"
 
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "kryptert med %s-n�kkel, ID %s\n"
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "offentlig n�kkel-dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr ""
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 msgid "encrypted with 1 passphrase\n"
 msgstr ""
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr ""
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "opprinnelig filnavn=�%.*s�\n"
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 msgid "no signature found\n"
 msgstr "ingen signatur ble funnet\n"
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 msgid "can't handle this ambiguous signature data\n"
 msgstr ""
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur opprettet %s\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               bruker %s n�kkel %s\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatur laget %s ved hjelp av %s-n�kkel ID %s\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 msgid "Key available at: "
 msgstr "N�kkel tilgjengelig ved: "
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "D�RLIG signatur fra �%s�"
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utg�tt signatur fra �%s�"
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "God signatur fra �%s�"
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr "[usikker]"
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka �%s�"
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signatur utg�tt %s\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signatur utg�r %s\n"
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur, digestalgoritme %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 msgid "binary"
 msgstr "bin�r"
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr "tekstmodus"
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 msgid "unknown"
 msgstr "ukjent"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 msgid "not a detached signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -5037,39 +5037,39 @@ msgstr "flertydig valg �%s�\n"
 msgid "unknown option `%s'\n"
 msgstr "ukjent valg �%s�\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Fila �%s� finnes. "
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 msgid "Overwrite? (y/N) "
 msgstr "Overskrive (j/N) "
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr ""
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "Tast inn nytt filnavn"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "skriver til stdout\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "antar at signert data er i �%s�\n"
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "ny konfigurasjonsfil �%s� ble opprettet\n"
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "ADVARSEL: valgene i �%s� er ikke aktive under denne kj�ringen\n"
@@ -6182,19 +6182,19 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "kan ikke �pne �%s�: %s\n"
diff --git a/po/pl.po b/po/pl.po
index dbc790641..5f02d5394 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
 "PO-Revision-Date: 2004-06-23 15:54+0200\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -87,8 +87,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
@@ -96,10 +96,10 @@ msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -376,7 +376,7 @@ msgstr "b��d tworzenia `%s': %s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nie mo�na utworzy� katalogu ,,%s'': %s\n"
@@ -405,7 +405,7 @@ msgstr "zapis zmian nie powi�d� si�: %s\n"
 msgid "listening on socket `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: katalog utworzony\n"
@@ -1314,12 +1314,12 @@ msgstr "%s nie jest dost�pne w trybie %s\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s zaszyfrowany dla: ,,%s''\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dane zaszyfrowano za pomoc� %s\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
@@ -2847,7 +2847,7 @@ msgstr "klucz %08lX: nowy klucz - pomini�ty\n"
 msgid "no writable keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
@@ -3889,7 +3889,7 @@ msgstr " (poufne)"
 msgid "created: %s"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[uniewa�niony]"
@@ -3901,7 +3901,7 @@ msgstr " [wygasa :%s]"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [wygasa :%s]"
@@ -3938,13 +3938,13 @@ msgstr ""
 "dop�ki program nie zostanie uruchomiony ponownie.\n"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[uniewa�niony]"
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "data"
@@ -5010,213 +5010,213 @@ msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "%d - dziwny rozmiar jak na zaszyfrowany klucz sesyjny\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "klucz sesyjny zaszyfrowany %s\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "klucz publiczny %08lX\n"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "zaszyfrowano %u-bitowym kluczem %s, numer %08lX, stworzonym %s\n"
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                        alias \""
 
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "zaszyfrowano kluczem %s, o numerze %08lX\n"
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "b��d odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "zaszyfrowane za pomoc� %lu hase�\n"
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 msgid "encrypted with 1 passphrase\n"
 msgstr "zaszyfrowane jednym has�em\n"
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "przyjmuj�c �e dane zosta�y zaszyfrowane za pomoc� %s\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "szyfr IDEA nie jest dost�pny, pr�ba u�ycia %s zamiast\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr "odszyfrowanie poprawne\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "WARNING: message was not integrity protected\n"
 msgstr "OSTRZE�ENIE: wiadomo�� nie by�a zabezpieczona przed manipulacj�\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZE�ENIE: zaszyfrowana wiadomo�� by�a manipulowana!\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "osobny certyfikat uniewa�nienia - u�yj ,,gpg --import'' aby go wczyta�\n"
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "nie mo�na obs�uzy� tych wielokrotnych podpis�w\n"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpisano w %.*s kluczem %s o numerze %08lX.\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 msgid "Key available at: "
 msgstr "Klucz dost�pny w: "
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Przeterminowany podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr "[niepewne]"
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Wa�no�� podpisu wygasa %s.\n"
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 msgid "binary"
 msgstr "binarny"
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr "tekstowy"
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 msgid "unknown"
 msgstr "nieznany"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mo�na sprawdzi� podpisu: %s\n"
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 msgid "not a detached signature\n"
 msgstr "nie jest oddzielonym podpisem.\n"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "OSTRZE�ENIE: wielokrotne podpisy. Tylko pierwszy zostanie sprawdzony.\n"
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x.\n"
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x).\n"
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
@@ -5314,40 +5314,40 @@ msgstr "odczyt opcji z ,,%s''\n"
 msgid "unknown option `%s'\n"
 msgstr "nieznany domy�lny adresat ,,%s''\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Plik ,,%s'' ju� istnieje. "
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Nadpisa� (t/N)? "
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: nieznana ko�c�wka nazwy\n"
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "Nazwa pliku"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "zapisywanie na wyj�cie standardowe\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "przyj�to obecno�� podpisanych danych w '%s'\n"
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "nowy plik ustawie� ,,%s'' zosta� utworzony\n"
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "OSTRZE�ENIE: opcje w ,,%s'' nie s� jeszcze uwzgl�dnione.\n"
@@ -6522,7 +6522,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: zapis nie powi�d� si�: %s\n"
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6532,12 +6532,12 @@ msgstr ""
 "Nale�y pami�ta� o podawaniu pliku podpisu (.sig lub .asc) jako pierwszego\n"
 "argumentu linii polece�.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linia wej�cia %u zbyt d�uga lub brak znaku LF\n"
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
diff --git a/po/pt.po b/po/pt.po
index 391c252db..a274c552d 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt <[email protected]>\n"
@@ -80,8 +80,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
@@ -89,10 +89,10 @@ msgstr "imposs�vel criar `%s': %s\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -369,7 +369,7 @@ msgstr "erro ao criar `%s': %s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
@@ -398,7 +398,7 @@ msgstr "actualiza��o falhou: %s\n"
 msgid "listening on socket `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directoria criada\n"
@@ -1309,12 +1309,12 @@ msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados cifrados com %s\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
@@ -2835,7 +2835,7 @@ msgstr "chave %08lX: chave nova - ignorada\n"
 msgid "no writable keyring found: %s\n"
 msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
@@ -3875,7 +3875,7 @@ msgstr " (sens�vel)"
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
@@ -3887,7 +3887,7 @@ msgstr "[expira: %s]"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[expira: %s]"
@@ -3924,13 +3924,13 @@ msgstr ""
 "correcta a n�o ser que reinicie o programa.\n"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4989,216 +4989,216 @@ msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tamanho estranho para uma chave de sess�o cifrada (%d)\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "tamanho estranho para uma chave de sess�o cifrada (%d)\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados cifrados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifragem de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "a assumir dados cifrados %s\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cifra IDEO n�o dispon�vel, a tentar utilizar %s em substitui��o\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr "decifragem correcta\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: a mensagem n�o tinha a sua integridade protegida\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca��o solit�ria - utilize \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "n�o consigo tratar estas assinaturas m�ltiplas\n"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura expirada de \""
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, fuzzy
 msgid "binary"
 msgstr "primary"
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 msgid "not a detached signature\n"
 msgstr "n�o � uma assinatura separada\n"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVISO: v�rias assinaturas detectadas.  Apenas a primeira ser� verificada.\n"
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -5299,40 +5299,40 @@ msgstr "a ler op��es de `%s'\n"
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Arquivo `%s' j� existe. "
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Escrever por cima (s/N)? "
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufixo desconhecido\n"
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "Digite novo nome de ficheiro"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "a escrever em \"stdout\"\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "a assumir dados assinados em `%s'\n"
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "AVISO: op��es em `%s' ainda n�o est�o activas nesta execu��o\n"
@@ -6498,7 +6498,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registo de confian�a %lu, tipo %d: escrita falhou: %s\n"
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6508,12 +6508,12 @@ msgstr ""
 "N�o se esque�a que o ficheiro com a assinatura (.sig ou .asc)\n"
 "deve ser o primeiro a ser dado na linha de comando.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linha de entrada %u demasiado longa ou falta o LF\n"
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 23a9bfe50..8a691a6e2 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -84,8 +84,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
@@ -93,10 +93,10 @@ msgstr "imposs�vel criar %s: %s\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -373,7 +373,7 @@ msgstr "erro na leitura de `%s': %s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
@@ -402,7 +402,7 @@ msgstr "atualiza��o falhou: %s\n"
 msgid "listening on socket `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: diret�rio criado\n"
@@ -1308,12 +1308,12 @@ msgstr ""
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s criptografado para: %s\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "criptografado com algoritmo desconhecido %d\n"
@@ -2793,7 +2793,7 @@ msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 msgid "no writable keyring found: %s\n"
 msgstr "imposs�vel escrever chaveiro: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
@@ -3815,7 +3815,7 @@ msgstr ""
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
@@ -3827,7 +3827,7 @@ msgstr "A chave expira em %s\n"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "A chave expira em %s\n"
@@ -3862,13 +3862,13 @@ msgid ""
 msgstr ""
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4937,216 +4937,216 @@ msgstr "%s: novo arquivo de op��es criado\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "criptografado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados criptografados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "criptografado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "criptografado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descriptografia de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr "descriptografia correta\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoga��o isolada - use \"gpg --import\" para aplic�-la\n"
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura isolada da classe 0x%02x\n"
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -5245,40 +5245,40 @@ msgstr "lendo op��es de `%s'\n"
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Arquivo `%s' j� existe. "
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Sobrescrever (s/N)? "
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufixo desconhecido\n"
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "Digite novo nome de arquivo"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "escrevendo em \"stdout\"\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "assumindo dados assinados em `%s'\n"
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, fuzzy, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
@@ -6439,7 +6439,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registro de confian�a %lu, tipo %d: escrita falhou: %s\n"
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6449,12 +6449,12 @@ msgstr ""
 "Por favor lembre-se de que o arquivo com a assinatura (.sig ou .asc)\n"
 "deve ser o primeiro arquivo dado na linha de comando.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linha %u muito longa ou sem LF\n"
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
diff --git a/po/ro.po b/po/ro.po
index be32720f1..8bc039eba 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
 "PO-Revision-Date: 2005-05-31 22:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
 "Language-Team: Romanian <[email protected]>\n"
@@ -82,8 +82,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritm rezumat %d nu este suportat\n"
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nu pot crea `%s': %s\n"
@@ -91,10 +91,10 @@ msgstr "nu pot crea `%s': %s\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -371,7 +371,7 @@ msgstr "eroare la creearea `%s': %s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
@@ -400,7 +400,7 @@ msgstr "actualizarea a e�uat: %s\n"
 msgid "listening on socket `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "director `%s' creat\n"
@@ -1283,12 +1283,12 @@ msgstr "nu pute�i folosi %s c�t� vreme �n modul %s\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrat pentru: \"%s\"\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s date cifrate\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrat cu un algoritm necunoscut %d\n"
@@ -2830,7 +2830,7 @@ msgstr "cheia %s: cheie nou� - s�rit�\n"
 msgid "no writable keyring found: %s\n"
 msgstr "n-am g�sit nici un inel de chei ce poate fi scris: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scriu �n `%s'\n"
@@ -3815,7 +3815,7 @@ msgstr " (senzitiv)"
 msgid "created: %s"
 msgstr "creat�: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, c-format
 msgid "revoked: %s"
 msgstr "revocat�: %s"
@@ -3827,7 +3827,7 @@ msgstr "expirat�: %s"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, c-format
 msgid "expires: %s"
 msgstr "expir�: %s"
@@ -3865,12 +3865,12 @@ msgstr ""
 
 #
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "revocat�"
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "expirat�"
 
@@ -4912,212 +4912,212 @@ msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "dimensiune ciudat� pentru o cheie de sesiune cifrat� (%d)\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s cheie de sesiune cifrat�\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "fraza-parol� generat� cu un algoritm rezumat necunoscut %d\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, c-format
 msgid "public key is %s\n"
 msgstr "cheia public� este %s\n"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr "date cigrate cu cheie public�: DEK bun\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrat cu cheia %u-bit %s, ID %s, creat� %s\n"
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrat cu cheia %s, ID %s\n"
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decriptarea cu cheie public� a e�uat: %s\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrat� cu %lu fraze-parol�\n"
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrat� cu 1 fraz�-parol�\n"
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "presupunem date cifrate %s\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "cifru IDEA indisponibil, vom �ncerca s� folosim %s �n loc\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr "decriptare OK\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTISMENT: mesajul nu a avut integritatea protejat�\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTISMENT: mesajul cifrat a fost manipulat!\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decriptarea a e�uat: %s\n"
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOT�: expeditorul a cerut \"doar-pentru-ochii-d-voastr�\"\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nume fi�ier original='%.*s'\n"
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocare standalone - folosi�i \"gpg --import\" pentru a aplica\n"
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Semn�tur� bun� din \"%s\""
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr "verificare semn�tur� eliminat�\n"
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "nu pot m�nui aceste semn�turi multiple\n"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Semn�tur� f�cut� %s\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               folosind cheia %s %s\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Semn�tur� f�cut� %s folosind cheia %s cu ID %s\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 msgid "Key available at: "
 msgstr "Cheie disponibil� la: "
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Semn�tur� INCORECT� din \"%s\""
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Semn�tur� expirat� din \"%s\""
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Semn�tur� bun� din \"%s\""
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr "[nesigur]"
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Semn�tur� expirat� %s\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Semn�tura expir� %s\n"
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "semn�tur� %s, algoritm rezumat %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 msgid "binary"
 msgstr "binar"
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr "modtext"
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 msgid "unknown"
 msgstr "necunoscut"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nu pot verifica semn�tura: %s\n"
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 msgid "not a detached signature\n"
 msgstr "nu o semn�tur� deta�at�\n"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVERTISMENT: am detectat multiple semn�turi.  Numai prima va fi verificat�.\n"
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "semn�tur� de sine st�t�toare (standalone) de clas� 0x%02x\n"
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr "semn�tur� de stil vechi (PGP 2.x)\n"
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pachet root invalid detectat �n proc_tree()\n"
 
@@ -5215,39 +5215,39 @@ msgstr "op�iune ambigu� `%s'\n"
 msgid "unknown option `%s'\n"
 msgstr "op�iune necunoscut� `%s'\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Fi�ierul `%s' exist�. "
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 msgid "Overwrite? (y/N) "
 msgstr "Suprascriu? (d/N) "
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufix necunoscut\n"
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "Introduce�i un nou nume-fi�ier"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "scriu la stdout\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "presupun date semnate �n `%s'\n"
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "fi�ier de configurare nou `%s' creat\n"
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
@@ -6402,7 +6402,7 @@ msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "nu pot actualiza �nregistrare versiunii trustdb: scrierea a e�uat: %s\n"
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6412,12 +6412,12 @@ msgstr ""
 "V� rug�m aminti�i-v� c� fi�ierul de semn�tur� (.sig sau .asc)\n"
 "ar trebui s� fie primul dat �n linia de comand�.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linia de intrare %u prea lung� sau lipse�te LF\n"
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "nu pot deschide `%s': %s\n"
diff --git a/po/ru.po b/po/ru.po
index 3689afa64..3602b5ea3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 2.0.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
 "PO-Revision-Date: 2006-11-07 19:31+0300\n"
 "Last-Translator: Maxim Britov <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -72,8 +72,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "не поддерживаются ssh ключи превышающие %d бит\n"
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "не могу создать `%s': %s\n"
@@ -81,10 +81,10 @@ msgstr "не могу создать `%s': %s\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -349,7 +349,7 @@ msgstr "ошибка создания `%s': %s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "не могу создать каталог `%s': %s\n"
@@ -378,7 +378,7 @@ msgstr ""
 msgid "listening on socket `%s'\n"
 msgstr "слушаем сокет `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "создан каталог `%s'\n"
@@ -1251,12 +1251,12 @@ msgstr "Нельзя использовать %s в режиме %s\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s зашифровано для: \"%s\"\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "Данные зашифрованы алгоритмом %s\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "зашифровано неизвестным алгоритмом %d\n"
@@ -2769,7 +2769,7 @@ msgstr "ключ %s: новый ключ - пропущен\n"
 msgid "no writable keyring found: %s\n"
 msgstr "нет доступной для записи таблицы ключей: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "сохраняю в `%s'\n"
@@ -3735,7 +3735,7 @@ msgstr ""
 msgid "created: %s"
 msgstr "создан: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, c-format
 msgid "revoked: %s"
 msgstr "отозван: %s"
@@ -3747,7 +3747,7 @@ msgstr "просрочен с: %s"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, c-format
 msgid "expires: %s"
 msgstr "годен до: %s"
@@ -3784,12 +3784,12 @@ msgstr ""
 "пока программа не будет перезапущена.\n"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "отозван"
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "просрочен с"
 
@@ -4814,210 +4814,210 @@ msgstr "ВНИМАНИЕ: невозможно загрузить ссылку %
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ВНИМАНИЕ: невозможно проанализировать ссылку %s\n"
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "странный размер зашифрованного сеансового ключа (%d)\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "сеансовый ключ зашифрован %s\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "фраза-пароль создана с незнакомой хеш-фкнкцией %d\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, c-format
 msgid "public key is %s\n"
 msgstr "открытый ключ %s\n"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr "данные зашифрованы открытым ключом: правильный DEK\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "зашифровано %u-битным ключом %s, с ID %s, созданным %s\n"
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "зашифровано ключом %s с ID %s\n"
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "сбой расшифрования с открытым ключом: %s\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "зашифровано с %lu фразами-паролями\n"
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 msgid "encrypted with 1 passphrase\n"
 msgstr "зашифровано с 1 фразой-паролем\n"
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "принятие %s зашифрованных данных\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "шифр IDEA недоступен, попробуйте использовать взамен %s\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr "расшифровано\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ВНИМАНИЕ: целостность сообщения не защищена\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ВНИМАНИЕ: зашифрованное сообщение было изменено!\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "сбой расшифрования: %s\n"
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "ЗАМЕЧАНИЕ: отправитель требует \"только для просмотра Вами\"\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "оригинальное имя файла='%.*s'\n"
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "самостоятельный сертификат отзыва: \"gpg --import\" для применения\n"
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 msgid "no signature found\n"
 msgstr "подпись не найдена\n"
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr "проверка подписи подавлена\n"
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 msgid "can't handle this ambiguous signature data\n"
 msgstr "не могу обработать эти множественные подписи\n"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Подпись сделана %s\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               ключом %s с ID %s\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпись создана %s ключом %s с ID %s\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 msgid "Key available at: "
 msgstr "Ключ доступен на:"
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ПЛОХАЯ подпись от  \"%s\""
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Просроченная подпись от \"%s\""
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Действительная подпись от \"%s\""
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr "[сомнительно]"
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Подпись просрочена %s\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Подпись действительна до %s\n"
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s подпись, хэш-функция %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 msgid "binary"
 msgstr "двоичный"
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr "текстовый"
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 msgid "unknown"
 msgstr "неизвестно"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Не могу проверить подпись: %s\n"
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 msgid "not a detached signature\n"
 msgstr "не отделенная подпись\n"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "ВНИМАНИЕ: обнаружено множество подписей.  Только первая будет проверена.\n"
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "самостоятельная подпись класса 0x%02x\n"
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr "старый (PGP 2.x) стиль подписи\n"
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -5119,39 +5119,39 @@ msgstr "двусмысленный параметр `%s'\n"
 msgid "unknown option `%s'\n"
 msgstr "неизвестный параметр `%s'\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Файл `%s' существует. "
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 msgid "Overwrite? (y/N) "
 msgstr "Перезаписать (y/N)? "
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: неизвестное окончание\n"
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "Введите новое имя файла"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "Вывод в stdout\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "принятие подписанных данных в `%s'\n"
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "создан новый файл настроек `%s'\n"
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "ВНИМАНИЕ: параметры в `%s' еще не активны при этом запуске\n"
@@ -6293,7 +6293,7 @@ msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "невозможно обновить запись о версии таблицы доверий: ошибка записи: %s\n"
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6303,12 +6303,12 @@ msgstr ""
 "Файл подписи (.sig или .asc) должен быть\n"
 "первым из файлов в командной строке.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "входная строка %u слишком длинная или пропущен LF\n"
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "не могу открыть `%s': %s\n"
diff --git a/po/sk.po b/po/sk.po
index 51427fac1..79a5f38fc 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <[email protected]>\n"
 "Language-Team: Slovak <[email protected]>\n"
@@ -76,8 +76,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
@@ -85,10 +85,10 @@ msgstr "nem��em vytvori� `%s': %s\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -366,7 +366,7 @@ msgstr "chyba pri vytv�ran� `%s': %s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nem��em vytvori� adres�r `%s': %s\n"
@@ -395,7 +395,7 @@ msgstr "aktualiz�cia zlyhala: %s\n"
 msgid "listening on socket `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: adres�r vytvoren�\n"
@@ -1303,12 +1303,12 @@ msgstr ""
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s za�ifrovan� pre: %s\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s za�ifrovan� d�ta\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
@@ -2843,7 +2843,7 @@ msgstr "k��� %08lX: nov� k��� - presko�en�\n"
 msgid "no writable keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor k���ov (keyring): %s\n"
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisujem do '%s'\n"
@@ -3883,7 +3883,7 @@ msgstr "(citliv� inform�cia)"
 msgid "created: %s"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revokovan�]"
@@ -3895,7 +3895,7 @@ msgstr " [platnos� skon��: %s]"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [platnos� skon��: %s]"
@@ -3932,13 +3932,13 @@ msgstr ""
 "by� spr�vne, pokia� znovu nespust�te program.\n"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[revokovan�]"
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4993,218 +4993,218 @@ msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "zvl�tna ve�kos� �ifrovacieho k���a pre sedenie (%d)\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s k��� �ifrovan�ho sedenia\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "verejn� k��� je %08lX\n"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr "d�ta za�ifrovan� verejn�m k���om: spr�vny DEK\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "za�ifrovan� %u-bitov�m %s k���om, ID %08lX, vytvoren�m %s\n"
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "za�ifrovan� %s k���om, ID %08lX\n"
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "de�ifrovanie verejn�m k���om zlyhalo: %s\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "za�ifrovan� s %lu heslami\n"
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 msgid "encrypted with 1 passphrase\n"
 msgstr "za�ifrovan� jedn�m heslom\n"
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "predpoklad�m %s �ifrovan�ch d�t\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "algoritmus IDEA nie je dostupn�; optimisticky sa ho pok�sime nahradi� "
 "algoritmom %s\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr "de�ifrovanie o.k.\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROVANIE: spr�va nem� ochranu integrity\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROVANIE: so za�ifrovanou spr�vou bolo manipulovan�!\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "POZN�MKA: odosielate� po�adoval (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "p�vodn� meno s�boru='%.*s'\n"
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "samostatn� revoka�n� certifik�t -  pou�ite \"gpg --import\", ak ho chcete "
 "vyu�i�\n"
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Dobr� podpis od \""
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr "verifik�cia podpisu potla�en�\n"
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neviem pracova� s t�mito n�sobn�mi podpismi\n"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpis vytvoren� %.*s pomocou %s k���a ID %08lX\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 msgid "Key available at: "
 msgstr "K��� k dispoz�cii na: "
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ZL� podpis od \""
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypr�anou platnos�ou od \""
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobr� podpis od \""
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr "[neist�]  "
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnos� podpisu vypr�� %s\n"
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 msgid "binary"
 msgstr "bin�rne"
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr "textov� m�d"
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 msgid "unknown"
 msgstr "nezn�me"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem��em overi� podpis: %s\n"
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 msgid "not a detached signature\n"
 msgstr "toto nie je podpis oddelen� od dokumentu\n"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "VAROVANIE: N�jden� viacn�sobne podpisy. Skontrolovan� bude len prv�.\n"
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis triedy 0x%02x\n"
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "n�jden� neplatn� kore�ov� paket v proc_tree()\n"
 
@@ -5303,40 +5303,40 @@ msgstr "��tam mo�nosti z `%s'\n"
 msgid "unknown option `%s'\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "S�bor `%s' existuje. "
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Prep�sa� (a/N)? "
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: nezn�ma pr�pona\n"
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "Vlo�te nov� n�zov s�boru"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "zapisujem na �tandardn� v�stup (stdout)\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "predpoklad�m podp�san� d�ta v `%s'\n"
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "vytvoren� nov� konfigura�n� s�bor `%s'\n"
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "VAROVANIE: nastavenie v `%s' e�te nie je akt�vne\n"
@@ -6502,7 +6502,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "z�znam d�very %lu, typ %d: z�pis zlyhal: %s\n"
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6512,12 +6512,12 @@ msgstr ""
 "Pros�m, nezab�dajte, �e s�bor s podpisom (.sig alebo .asc)\n"
 "by mal by� prv�m s�borom zadan�m na pr�kazovom riadku.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "vstupn� riadok %u je pr�li� dlh� alebo na konci ch�ba znak LF\n"
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
diff --git a/po/sv.po b/po/sv.po
index eb6a5797d..63e108bf0 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
 "PO-Revision-Date: 2007-02-17 13:13+0100\n"
 "Last-Translator: Daniel Nylander <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -95,8 +95,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh-nycklar större än %d bitar stöds inte\n"
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
@@ -104,10 +104,10 @@ msgstr "kan inte skapa \"%s\": %s\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -377,7 +377,7 @@ msgstr "Fel när \"%s\" skapades: %s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan inte skapa katalog: %s\n"
@@ -406,7 +406,7 @@ msgstr "listen() misslyckades: %s\n"
 msgid "listening on socket `%s'\n"
 msgstr "lyssnar på uttaget \"%s\"\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen \"%s\" skapades\n"
@@ -1294,12 +1294,12 @@ msgstr "du kan inte använda %s när du är i %s-läget\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypterad för: \"%s\"\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s-krypterad data\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "krypterad med en okänd algoritm %d\n"
@@ -2855,7 +2855,7 @@ msgstr "nyckel %s: ny nyckel - hoppade över\n"
 msgid "no writable keyring found: %s\n"
 msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
@@ -3844,7 +3844,7 @@ msgstr "(känsligt)"
 msgid "created: %s"
 msgstr "skapat: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, c-format
 msgid "revoked: %s"
 msgstr "spärrad: %s"
@@ -3856,7 +3856,7 @@ msgstr "utgånget: %s"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, c-format
 msgid "expires: %s"
 msgstr "går ut: %s"
@@ -3893,12 +3893,12 @@ msgstr ""
 "såvida inte du startar om programmet.\n"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "spärrad"
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "utgånget"
 
@@ -4950,221 +4950,221 @@ msgstr "VARNING: kunde inte hämta uri:n %s: %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VARNING: kunde inte tolka uri:n %s\n"
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "egendomlig storlek på en krypterad sessionsnyckel (%d)\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s krypterad sessionsnyckel\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "lösenfras genererad med okänd sammandragsalgoritm %d\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, c-format
 msgid "public key is %s\n"
 msgstr "publik nyckel är %s\n"
 
 # Men jag ändrade så det blev närmare originalet. Per
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr "Data krypterat med publik nyckel: korrekt DEK\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "krypterad med %u-bitars %s-nyckel, id %s, skapad %s\n"
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "krypterad med %s-nyckel, id %s\n"
 
 # Motsatsen till kryptering med symmetrisk nyckel.
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dekryptering med publik nyckel misslyckades: %s\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "krypterad med %lu lösenfraser\n"
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 msgid "encrypted with 1 passphrase\n"
 msgstr "krypterad med with 1 lösenfras\n"
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "antar att %s krypterade data\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA-kryptering inte installerad. Optimistiskt försök att använda %s "
 "istället\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr "dekrypteringen lyckades\n"
 
 # Äldre krypteringalgoritmer skapar ingen mdc dvs. "minisignatur" som skyddar mot att delar av den krypterade texten byts ut/tas bort. Alla nya 128-bitars algoritmer använder mdc: AES, AES192, AES256, BLOWFISH.
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VARNING: detta meddelande var inte integritetsskyddat\n"
 
 # Meddelandet innebär alltså att kontrollen av mdc visade att meddelandet förändrats/manipulerats sedan det krypterades. Block kan ha tagits bort eller bytts ut.
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "OBS: avsändaren begärde \"endast-för-dina-ögon\"\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "fristående spärrcertifikat - använd \"gpg --import\" för\n"
 "att verkställa\n"
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 msgid "no signature found\n"
 msgstr "ingen signatur hittades\n"
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr "signaturvalidering utlämnad\n"
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 msgid "can't handle this ambiguous signature data\n"
 msgstr "kan inte hantera detta tvetydliga signaturdata\n"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur gjord %s\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "             med %s-nyckeln %s\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatur gjordes %s med %s nyckel-id %s\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 msgid "Key available at: "
 msgstr "Nyckeln tillgänglig hos: "
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FELAKTIG signatur från \"%s\""
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utgången signatur från \"%s\""
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekt signatur från \"%s\""
 
 # Visas vid ogiltig signatur:
 # Eftersom signaturen är ogiltig kan man inte vara säker på att angivet namn och nyckel-id är riktigt.
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr "[osäkert]"
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, c-format
 msgid "                aka \"%s\""
 msgstr "      även känd som \"%s\""
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Giltighetstiden för signaturen har upphört %s\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Giltighetstiden för signaturen går ut %s\n"
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 msgid "binary"
 msgstr "binär"
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr "textläge"
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 msgid "unknown"
 msgstr "okänd"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte kontrollera signaturen: %s\n"
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 msgid "not a detached signature\n"
 msgstr "detta är inte någon signatur i en separat fil\n"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "VARNING: multipla signaturer upptäckta. Endast den första kommer att "
 "kontrolleras.\n"
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "fristående signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ogiltigt rotpaket hittades i proc_tree()\n"
 
@@ -5261,39 +5261,39 @@ msgstr "tvetydlig flagga \"%s\"\n"
 msgid "unknown option `%s'\n"
 msgstr "okänd flagga \"%s\"\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Filen \"%s\" finns. "
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 msgid "Overwrite? (y/N) "
 msgstr "Skriv över? (j/N) "
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: okänt suffix\n"
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "Ange nytt filnamn"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "skriver till standard ut\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "antar att signerad data finns i filen \"%s\"\n"
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "ny konfigurationsfil \"%s\" skapad\n"
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
@@ -6488,7 +6488,7 @@ msgstr ""
 "kunde inte uppdatera versionspost i tillitsdatabasen: skrivning "
 "misslyckades: %s\n"
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6498,12 +6498,12 @@ msgstr ""
 "Kom ihåg att signaturfilen (.sig eller .asc)\n"
 "ska vara den först angivna filen på kommandoraden\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "raden %u är för lång, eller saknar nyradstecken\n"
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "kan inte öppna fd %d: %s\n"
diff --git a/po/tr.po b/po/tr.po
index 57a5229e5..a5ad0ad16 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.9.94\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
 "PO-Revision-Date: 2006-11-04 03:45+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -75,8 +75,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "%d bitlikten daha büyük SSH anahtarları desteklenmiyor\n"
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "\"%s\" oluşturulamıyor: %s\n"
@@ -84,10 +84,10 @@ msgstr "\"%s\" oluşturulamıyor: %s\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -352,7 +352,7 @@ msgstr "`%s' oluşturulurken hata: %s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "`%s' dizini oluşturulamıyor: %s\n"
@@ -381,7 +381,7 @@ msgstr "soket dinleme başarısız: %s\n"
 msgid "listening on socket `%s'\n"
 msgstr "`%s' soketi dinlemede\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "dizin `%s' oluşturuldu\n"
@@ -1260,12 +1260,12 @@ msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s \"%s\" için şifrelendi\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s şifreli veri\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "bilinmeyen algoritma %d ile şifrelenmiş\n"
@@ -2768,7 +2768,7 @@ msgstr "anahtar %s: yeni anahtar - atlandı\n"
 msgid "no writable keyring found: %s\n"
 msgstr "yazılabilir bir anahtarlık yok: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "\"%s\"e yazıyor\n"
@@ -3777,7 +3777,7 @@ msgstr "(duyarlı)"
 msgid "created: %s"
 msgstr "oluşturuldu: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, c-format
 msgid "revoked: %s"
 msgstr "yürürlükten kaldırıldı: %s"
@@ -3789,7 +3789,7 @@ msgstr "son kullanma tarihi: %s"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, c-format
 msgid "expires: %s"
 msgstr "son kullanma tarihi: %s"
@@ -3826,12 +3826,12 @@ msgstr ""
 "doğrulukta olmayacağını lütfen gözönüne alınız.\n"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "yürürlükten kaldırıldı"
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "zamanaşımına uğradı"
 
@@ -4882,213 +4882,213 @@ msgstr "UYARI: Betimleyici %s alınamıyor: %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "UYARI: Betimleyici %s çözümlenemiyor\n"
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "bir şifreli oturum anahtarı (%d) için tuhaf uzunluk\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s şifreli oturum anahtarı\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "bilinmeyen özümleme algoritması ile üretilmiş anahtar parolası %d\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, c-format
 msgid "public key is %s\n"
 msgstr "genel anahtar: %s\n"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr "genel anahtarla şifreli veri: doğru DEK\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr ""
 "%u bitlik %s anahtarı ve %s kullanıcı kimliği ile şifrelendi, %s tarihinde "
 "oluşturuldu\n"
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "%s anahtarı ve %s kullanıcı kimliği ile şifrelenmiş\n"
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "genel anahtar şifre çözümü başarısız: %s\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s şifreli veri varsayılıyor\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA şifre kullanışsız, iyimserlikle yerine %s kullanılmaya çalışılıyor\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr "Şifre çözme tamam\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "WARNING: message was not integrity protected\n"
 msgstr "UYARI: ileti bütünlük korumalı değildi\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "UYARI: şifreli ileti tahrip edilmiş!\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "şifre çözme başarısız: %s\n"
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "BİLGİ: gönderen \"yalnız-gözleriniz-için\" ricasında bulundu\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "özgün dosya adı = '%.*s'\n"
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "tek başına yürürlükten kaldırma - uygulamak için \"gpg --import\" kullanın\n"
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 msgid "no signature found\n"
 msgstr "hiç imza yok\n"
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr "imza doğrulama engellendi\n"
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 msgid "can't handle this ambiguous signature data\n"
 msgstr "bu belirsiz imza verisi elde edilemiyor\n"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, c-format
 msgid "Signature made %s\n"
 msgstr "İmza %s de\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s kullanılarak anahtar %s ile yapılmış\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "%s imzası, %s anahtarı ve %s kullanıcı kimliği ile yapılmış\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 msgid "Key available at: "
 msgstr "Anahtar burada:"
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "\"%s\" deki imza KÖTÜ"
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "\"%s\" deki imza zamanaşımına uğramış"
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "\"%s\" deki imza iyi"
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr "[şüpheli]"
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                nam-ı diğer \"%s\""
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitti.\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s imzası, %s özümleme algoritması\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 msgid "binary"
 msgstr "ikili"
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr "metinkipi"
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "İmza kontrol edilemedi: %s\n"
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 msgid "not a detached signature\n"
 msgstr "bir bağımsız imza değil\n"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n"
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x sınıfı tek başına imza\n"
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr "eski stil (PGP 2.x) imza\n"
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() içinde geçersiz kök paket saptandı\n"
 
@@ -5185,39 +5185,39 @@ msgstr "`%s' seçeneği belirsiz\n"
 msgid "unknown option `%s'\n"
 msgstr "`%s' seçeneği bilinmiyor\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "\"%s\" dosyası var. "
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 msgid "Overwrite? (y/N) "
 msgstr "Üzerine yazılsın mı? (e/H ya da y/N) "
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: bilinmeyen sonek\n"
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "Yeni dosya ismini giriniz"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "standart çıktıya yazıyor\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "\"%s\" içindeki veri imzalı kabul ediliyor\n"
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "yeni yapılandırma dosyası `%s' oluşturuldu\n"
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
@@ -6373,7 +6373,7 @@ msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "güvence veritabanının sürüm kaydı güncellenemedi: yazma başarısız: %s\n"
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6383,12 +6383,12 @@ msgstr ""
 "İmza dosyasının (.sig veya .asc) komut satırında verilecek\n"
 "ilk dosya olması gerektiğini lütfen hatırlayın.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "girdi satırı %u ya çok uzun ya da sonunda satırsonu karakteri yok\n"
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "`%s' açılamıyor: %s\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b69077193..39ac2db13 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
 "PO-Revision-Date: 2006-07-02 10:58+0800\n"
 "Last-Translator: Meng Jie <[email protected]>\n"
 "Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -82,8 +82,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "不支持保护散列 %d\n"
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "无法建立‘%s’：%s\n"
@@ -91,10 +91,10 @@ msgstr "无法建立‘%s’：%s\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -372,7 +372,7 @@ msgstr "建立‘%s’时发生错误：%s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "无法建立目录‘%s’：%s\n"
@@ -401,7 +401,7 @@ msgstr "更新失败：%s\n"
 msgid "listening on socket `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "已创建目录‘%s’\n"
@@ -1268,12 +1268,12 @@ msgstr "您不该将 %s 用于 %s 模式中\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已经加密给：“%s”\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 加密过的数据\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的算法 %d 加密\n"
@@ -2737,7 +2737,7 @@ msgstr "密钥 %s：新密钥――已跳过\n"
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可写的钥匙环：%s\n"
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在写入‘%s’\n"
@@ -3694,7 +3694,7 @@ msgstr " (敏感的)"
 msgid "created: %s"
 msgstr "创建于：%s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, c-format
 msgid "revoked: %s"
 msgstr "已吊销：%s"
@@ -3706,7 +3706,7 @@ msgstr "已过期：%s"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, c-format
 msgid "expires: %s"
 msgstr "有效至：%s"
@@ -3741,12 +3741,12 @@ msgid ""
 msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "已吊销"
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "已过期"
 
@@ -4769,209 +4769,209 @@ msgstr "警告：无法获取 URI %s：%s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "不能解析 URI %s\n"
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "加密过的会话密钥尺寸(%d)诡异\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s 加密过的会话密钥\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密码由未知的散列算法 %d 生成\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, c-format
 msgid "public key is %s\n"
 msgstr "公钥是 %s\n"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr "公钥加密过的数据：完好的数据加密密钥\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "由 %u 位的 %s 密钥加密，钥匙号为 %s、生成于 %s\n"
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s”\n"
 
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "由 %s 密钥加密、钥匙号为 %s\n"
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公钥解密失败：%s\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "以 %lu 个密码加密\n"
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 msgid "encrypted with 1 passphrase\n"
 msgstr "以 1 个密码加密\n"
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 为加密过的数据\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 算法不可用，试以 %s 代替\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr "解密成功\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告：报文未受到完整的保护\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告：加密过的报文已经变造！\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失败：%s\n"
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "注意：发件者要求您“只阅读不存盘”\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始文件名 =‘%.*s’\n"
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 msgid "no signature found\n"
 msgstr "未找到签名\n"
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr "签名验证已被抑制\n"
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 msgid "can't handle this ambiguous signature data\n"
 msgstr "无法处理这些有歧义的签名\n"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, c-format
 msgid "Signature made %s\n"
 msgstr "签名建立于 %s\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "              使用 %s 密钥 %s\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "于 %s 创建的签名，使用 %s，钥匙号 %s\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 msgid "Key available at: "
 msgstr "可用的密钥在："
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "已损坏的签名，来自于“%s”"
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "过期的签名，来自于“%s”"
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的签名，来自于“%s”"
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr "[不确定]"
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, c-format
 msgid "                aka \"%s\""
 msgstr "              亦即“%s”"
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "这份签名已于 %s 过期。\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "这份签名在 %s 过期。\n"
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s 签名，散列算法 %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 msgid "binary"
 msgstr "二进制"
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr "文本模式"
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "无法检查签名：%s\n"
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 msgid "not a detached signature\n"
 msgstr "不是一份分离的签名\n"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告：检测到多重签名。只检查第一个签名。\n"
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等级 0x%02x 的独立签名\n"
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr "旧式(PGP 2.x)签名\n"
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中检测到无效的根包\n"
 
@@ -5068,39 +5068,39 @@ msgstr "有歧义的选项‘%s’\n"
 msgid "unknown option `%s'\n"
 msgstr "未知的选项 '%s'\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "文件‘%s’已存在。 "
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 msgid "Overwrite? (y/N) "
 msgstr "是否覆盖？(y/N)"
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s：未知的后缀名\n"
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "请输入新的文件名"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "正在写入到标准输出\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "假定被签名的数据是‘%s’\n"
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "新的配置文件‘%s’已建立\n"
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "警告：在‘%s’里的选项于此次运行期间未被使用\n"
@@ -6205,7 +6205,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "无法更新信任度数据库版本记录：写入失败：%s\n"
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6215,12 +6215,12 @@ msgstr ""
 "请记住签名文件(.sig或.asc)\n"
 "应该是在命令行中给定的第一个文件。\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "输入行 %u 太长或者行末的换行符 LF 遗失\n"
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "无法打开‘%s’： %s\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3e5e84c34..16bc76eb4 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+0200\n"
 "PO-Revision-Date: 2005-07-29 09:49+0800\n"
 "Last-Translator: Jedi <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
@@ -80,8 +80,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "保護摘要 %d 未被支援\n"
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "無法建立 `%s': %s\n"
@@ -89,10 +89,10 @@ msgstr "無法建立 `%s': %s\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -368,7 +368,7 @@ msgstr "建立 `%s' 時發生錯誤: %s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "無法建立目錄 `%s': %s\n"
@@ -397,7 +397,7 @@ msgstr "更新失敗: %s\n"
 msgid "listening on socket `%s'\n"
 msgstr "正在將私鑰寫至 `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "目錄 `%s' 已建立\n"
@@ -1263,12 +1263,12 @@ msgstr "妳不能夠將 %s 用於 %s 模式中\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已經加密給: \"%s\"\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 加密過的資料\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的演算法 %d 加密過\n"
@@ -2756,7 +2756,7 @@ msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可寫的鑰匙圈: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在寫到 `%s'\n"
@@ -3723,7 +3723,7 @@ msgstr "(機密的)"
 msgid "created: %s"
 msgstr "建立於: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, c-format
 msgid "revoked: %s"
 msgstr "已撤銷: %s"
@@ -3737,7 +3737,7 @@ msgstr "已過期: %s"
 #  of subkey
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, c-format
 msgid "expires: %s"
 msgstr "過期: %s"
@@ -3774,12 +3774,12 @@ msgstr ""
 "除非妳重新執行程式.\n"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "已撤銷"
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "已過期"
 
@@ -4803,211 +4803,211 @@ msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "加密過的階段金鑰 (%d) 尺寸詭異\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s 加密過的階段金鑰\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密語係以未知的摘要演算法 %d 所產生\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, c-format
 msgid "public key is %s\n"
 msgstr "公鑰為 %s\n"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr "公鑰加密過的資料: 完好的 DEK\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "已用 %u 位元長的 %s 金鑰,  ID %s, 建立於 %s 加密了\n"
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "已用 %s 金鑰, ID %s 加密了\n"
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公鑰解密失敗: %s\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "已用 %lu 個密語加密了\n"
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 msgid "encrypted with 1 passphrase\n"
 msgstr "已用 1 個密語加密了\n"
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 為加密過的資料\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 編密法不可用, 我們樂觀地試著改以 %s 代替\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr "解密成功\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告: 訊息未受到完整的保護\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告: 加密過的訊息已經被變造了!\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失敗: %s\n"
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "請注意: 寄件者要求了 \"妳應該祇用眼睛看\"\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始的檔名 ='%.*s'\n"
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 #, fuzzy
 msgid "no signature found\n"
 msgstr "完好的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr "簽章驗證已被抑制\n"
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "無法處理這些多重簽章\n"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, c-format
 msgid "Signature made %s\n"
 msgstr "由 %s 建立的簽章\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               使用 %s 金鑰 %s\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 msgid "Key available at: "
 msgstr "可用的金鑰於: "
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "*損壞* 的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "過期的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr "[ 不確定 ]"
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                亦即 \"%s\""
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "這份簽署已經在 %s 過期了\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "這份簽署在 %s 過期\n"
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s 簽章, 摘要演算法 %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 msgid "binary"
 msgstr "二進制"
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr "文字模式"
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "無法檢查簽章: %s\n"
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 msgid "not a detached signature\n"
 msgstr "不是一份分離的簽章\n"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等級 0x%02x 的獨立簽章\n"
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr "舊型 (PGP 2.x) 簽章\n"
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中偵測到無效的 root 封包\n"
 
@@ -5104,39 +5104,39 @@ msgstr "不明確的選項 `%s'\n"
 msgid "unknown option `%s'\n"
 msgstr "未知的選項 `%s'\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "檔案 `%s' 存在. "
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 msgid "Overwrite? (y/N) "
 msgstr "是否覆寫? (y/N) "
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: 未知的副檔名\n"
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "請輸入新的檔名"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "正在寫入到標準輸出\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "假設被簽署的資料在 `%s'\n"
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "新的設定檔 `%s' 被建立了\n"
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "警告: 在 `%s' 裡的選項於這次執行期間並沒有被啟用\n"
@@ -6247,7 +6247,7 @@ msgstr "深度: %d  有效: %3d  已簽署: %3d  信任: %d-, %dq, %dn, %dm, %df
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6257,12 +6257,12 @@ msgstr ""
 "請記住簽章檔 (.sig 或 .asc)\n"
 "應該是第一個命令列給定的檔案.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "輸入列 %u 太長或者列末的 LF 遺失了\n"
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "無法開啟 `%s': %s\n"
diff --git a/tools/ChangeLog b/tools/ChangeLog
index e112984d1..cd403e2bf 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-08  Werner Koch  <[email protected]>
+
+	* sockprox.c: New.  It needs to be build manually. By Moritz
+	Schulte.
+
 2007-04-20  Werner Koch  <[email protected]>
 
 	* symcryptrun.c (my_gcry_logger): Removed.
diff --git a/tools/Makefile.am b/tools/Makefile.am
index d3c355662..8bd20c5a3 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -21,7 +21,7 @@
 EXTRA_DIST = \
 	Manifest watchgnupg.c \
 	addgnupghome applygnupgdefaults gpgsm-gencert.sh \
-	lspgpot mail-signed-keys convert-from-106
+	lspgpot mail-signed-keys convert-from-106 sockprox.c
 
 
 AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common
diff --git a/tools/sockprox.c b/tools/sockprox.c
new file mode 100644
index 000000000..171facaa2
--- /dev/null
+++ b/tools/sockprox.c
@@ -0,0 +1,553 @@
+/* sockprox - Proxy for local sockets with logging facilities
+ *	Copyright (C) 2007 g10 Code GmbH.
+ *
+ * sockprox is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * sockprox is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+/* Hacked by Moritz Schulte <[email protected]>. 
+
+   Usage example:
+
+   Run a server which binds to a local socket.  For example,
+   gpg-agent.  gpg-agent's local socket is specified with --server.
+   sockprox opens a new local socket (here "mysock"); the whole
+   traffic between server and client is written to "/tmp/prot" in this
+   case.
+  
+     ./sockprox --server /tmp/gpg-PKdD8r/S.gpg-agent.ssh \
+                --listen mysock --protocol /tmp/prot
+  
+   Then, redirect your ssh-agent client to sockprox by setting
+   SSH_AUTH_SOCK to "mysock".
+*/
+
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <stddef.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <fcntl.h>
+#include <assert.h>
+#include <pthread.h>
+
+struct opt
+{
+  char *protocol_file;
+  char *server_spec;
+  char *listen_spec;
+  int verbose;
+};
+
+struct opt opt = { NULL, NULL, NULL, 0 };
+
+struct thread_data
+{
+  int client_sock;
+  FILE *protocol_file;
+};
+
+
+
+static int
+create_server_socket (const char *filename, int *new_sock)
+{
+  struct sockaddr_un name;
+  size_t size;
+  int sock;
+  int ret;
+  int err;
+
+  /* Create the socket. */
+  sock = socket (PF_LOCAL, SOCK_STREAM, 0);
+  if (sock < 0)
+    {
+      err = errno;
+      goto out;
+    }
+
+  /* Bind a name to the socket. */
+  name.sun_family = AF_LOCAL;
+  strncpy (name.sun_path, filename, sizeof (name.sun_path));
+  name.sun_path[sizeof (name.sun_path) - 1] = '\0';
+
+  size = SUN_LEN (&name);
+
+  remove (filename);
+
+  ret = bind (sock, (struct sockaddr *) &name, size);
+  if (ret < 0)
+    {
+      err = errno;
+      goto out;
+    }
+
+  ret = listen (sock, 2);
+  if (ret < 0)
+    {
+      err = errno;
+      goto out;
+    }
+
+  *new_sock = sock;
+  err = 0;
+
+ out:
+
+  return err;
+}
+
+static int
+connect_to_socket (const char *filename, int *new_sock)
+{
+  struct sockaddr_un srvr_addr;
+  size_t len;
+  int sock;
+  int ret;
+  int err;
+
+  sock = socket (PF_LOCAL, SOCK_STREAM, 0);
+  if (sock == -1)
+    {
+      err = errno;
+      goto out;
+    }
+
+  memset (&srvr_addr, 0, sizeof srvr_addr);
+  srvr_addr.sun_family = AF_LOCAL;
+  strncpy (srvr_addr.sun_path, filename, sizeof (srvr_addr.sun_path) - 1);
+  srvr_addr.sun_path[sizeof (srvr_addr.sun_path) - 1] = 0;
+  len = SUN_LEN (&srvr_addr);
+
+  ret = connect (sock, (struct sockaddr *) &srvr_addr, len);
+  if (ret == -1)
+    {
+      close (sock);
+      err = errno;
+      goto out;
+    }
+
+  *new_sock = sock;
+  err = 0;
+
+ out:
+
+  return err;
+}
+
+
+
+static int
+log_data (unsigned char *data, size_t length,
+	  FILE *from, FILE *to, FILE *protocol)
+{
+  unsigned int i;
+  int ret;
+  int err;
+
+  flockfile (protocol);
+  fprintf (protocol, "%i -> %i: ", fileno (from), fileno (to));
+  for (i = 0; i < length; i++)
+    fprintf (protocol, "%02X", data[i]);
+  fprintf (protocol, "\n");
+  funlockfile (protocol);
+
+  ret = fflush (protocol);
+  if (ret == EOF)
+    err = errno;
+  else
+    err = 0;
+
+  return err;
+}
+
+static int
+transfer_data (FILE *from, FILE *to, FILE *protocol)
+{
+  unsigned char buffer[BUFSIZ];
+  size_t len, written;
+  int err;
+  int ret;
+
+  err = 0;
+
+  while (1)
+    {
+      len = fread (buffer, 1, sizeof (buffer), from);
+      if (len == 0)
+	break;
+
+      err = log_data (buffer, len, from, to, protocol);
+      if (err)
+	break;
+
+      written = fwrite (buffer, 1, len, to);
+      if (written != len)
+	{
+	  err = errno;
+	  break;
+	}
+
+      ret = fflush (to);
+      if (ret == EOF)
+	{
+	  err = errno;
+	  break;
+	}
+
+      if (ferror (from))
+	break;
+    }
+
+  return err;
+}
+
+
+static int
+io_loop (FILE *client, FILE *server, FILE *protocol)
+{
+  fd_set active_fd_set, read_fd_set;
+  int ret;
+  int err;
+
+  FD_ZERO (&active_fd_set);
+  FD_SET (fileno (client), &active_fd_set);
+  FD_SET (fileno (server), &active_fd_set);
+
+  err = 0;
+
+  while (1)
+    {
+      read_fd_set = active_fd_set;
+
+      /* FIXME: eof?  */
+
+      ret = select (FD_SETSIZE, &read_fd_set, NULL, NULL, NULL);
+      if (ret < 0)
+	{
+	  err = errno;
+	  break;
+	}
+
+      if (FD_ISSET (fileno (client), &read_fd_set))
+	{
+	  if (feof (client))
+	    break;
+
+	  /* Forward data from client to server.  */
+	  err = transfer_data (client, server, protocol);
+	}
+      else if (FD_ISSET (fileno (server), &read_fd_set))
+	{
+	  if (feof (server))
+	    break;
+
+	  /* Forward data from server to client.  */
+	  err = transfer_data (server, client, protocol);
+	}
+
+      if (err)
+	break;
+    }
+
+  return err;
+}
+
+
+
+
+/* Set the `O_NONBLOCK' flag of DESC if VALUE is nonzero,
+   or clear the flag if VALUE is 0.
+   Return 0 on success, or -1 on error with `errno' set. */
+
+int
+set_nonblock_flag (int desc, int value)
+{
+  int oldflags = fcntl (desc, F_GETFL, 0);
+  int err;
+  int ret;
+
+  /* If reading the flags failed, return error indication now. */
+  if (oldflags == -1)
+    return -1;
+  /* Set just the flag we want to set. */
+  if (value != 0)
+    oldflags |= O_NONBLOCK;
+  else
+    oldflags &= ~O_NONBLOCK;
+  /* Store modified flag word in the descriptor. */
+
+  ret = fcntl (desc, F_SETFL, oldflags);
+  if (ret == -1)
+    err = errno;
+  else
+    err = 0;
+
+  return err;
+}
+
+
+
+void *
+serve_client (void *data)
+{
+  struct thread_data *thread_data = data;
+  int client_sock = thread_data->client_sock;
+  int server_sock;
+  FILE *protocol = thread_data->protocol_file;
+  FILE *client;
+  FILE *server;
+  int err;
+
+  client = NULL;
+  server = NULL;
+
+  /* Connect to server.  */
+  err = connect_to_socket (opt.server_spec, &server_sock);
+  if (err)
+    goto out;
+
+  /* Set IO mode to nonblicking.  */
+  err = set_nonblock_flag (server_sock, 1);
+  if (err)
+    goto out;
+
+  client = fdopen (client_sock, "r+");
+  if (! client)
+    {
+      err = errno;
+      goto out;
+    }
+
+  server = fdopen (server_sock, "r+");
+  if (! server)
+    {
+      err = errno;
+      goto out;
+    }
+
+  err = io_loop (client, server, protocol);
+
+ out:
+
+  if (client)
+    fclose (client);
+  else
+    close (client_sock);
+
+  if (server)
+    fclose (server);
+  else
+    close (server_sock);
+
+  free (data);
+
+  return NULL;
+}
+
+static int
+run_proxy (void)
+{
+  int client_sock;
+  int my_sock;
+  int err;
+  struct sockaddr_un clientname;
+  size_t size;
+  pthread_t  mythread;
+  struct thread_data *thread_data;
+  FILE *protocol_file;
+  pthread_attr_t thread_attr;
+
+  protocol_file = NULL;
+
+  err = pthread_attr_init (&thread_attr);
+  if (err)
+    goto out;
+
+  err = pthread_attr_setdetachstate (&thread_attr, PTHREAD_CREATE_DETACHED);
+  if (err)
+    goto out;
+
+  if (opt.protocol_file)
+    {
+      protocol_file = fopen (opt.protocol_file, "a");
+      if (! protocol_file)
+	{
+	  err = errno;
+	  goto out;
+	}
+    }
+  else
+    protocol_file = stdout;
+
+  err = create_server_socket (opt.listen_spec, &my_sock);
+  if (err)
+    goto out;
+
+  while (1)
+    {
+      /* Accept new client.  */
+      size = sizeof (clientname);
+      client_sock = accept (my_sock,
+			    (struct sockaddr *) &clientname,
+			    &size);
+      if (client_sock < 0)
+	{
+	  err = errno;
+	  break;
+	}
+
+      /* Set IO mode to nonblicking.  */
+      err = set_nonblock_flag (client_sock, 1);
+      if (err)
+	{
+	  close (client_sock);
+	  break;
+	}
+
+      /* Got new client -> handle in new process.  */
+
+      thread_data = malloc (sizeof (*thread_data));
+      if (! thread_data)
+	{
+	  err = errno;
+	  break;
+	}
+      thread_data->client_sock = client_sock;
+      thread_data->protocol_file = protocol_file;
+
+      err = pthread_create (&mythread, &thread_attr, serve_client, thread_data);
+      if (err)
+	break;
+    }
+  if (err)
+    goto out;
+
+  /* ? */
+
+ out:
+  
+  pthread_attr_destroy (&thread_attr);
+  fclose (protocol_file);	/* FIXME, err checking.  */
+
+  return err;
+}
+
+
+
+static int
+print_help (int ret)
+{
+  printf ("Usage: sockprox [options] "
+	  "--server SERVER-SOCKET --listen PROXY-SOCKET\n");
+  exit (ret);
+}
+
+int
+main (int argc, char **argv)
+{
+  struct option long_options[] =
+    {
+      { "help",     no_argument,       0,            'h' },
+      { "verbose",  no_argument,       &opt.verbose, 1   },
+      { "protocol", required_argument, 0,            'p' },
+      { "server",   required_argument, 0,            's' },
+      { "listen",   required_argument, 0,            'l' },
+      { 0, 0, 0, 0 }
+    };
+  int ret;
+  int err;
+  int c;
+
+  while (1)
+    {
+      int opt_idx = 0;
+      c = getopt_long (argc, argv, "hvp:s:l:",
+		       long_options, &opt_idx);
+
+      if (c == -1)
+	break;
+
+      switch (c)
+	{
+	case 0:
+	  if (long_options[opt_idx].flag)
+	    break;
+	  printf ("option %s", long_options[opt_idx].name);
+	  if (optarg)
+	    printf (" with arg %s", optarg);
+	  printf ("\n");
+	  break;
+
+	case 'p':
+	  opt.protocol_file = optarg;
+	  break;
+
+	case 's':
+	  opt.server_spec = optarg;
+	  break;
+
+	case 'l':
+	  opt.listen_spec = optarg;
+	  break;
+
+	case 'v':
+	  opt.verbose = 1;
+	  break;
+
+	case 'h':
+	  print_help (EXIT_SUCCESS);
+	  break;
+
+	default:
+	  abort ();
+	}
+    }
+
+  if (opt.verbose)
+    {
+      printf ("server: %s\n", opt.server_spec ? opt.server_spec : "");
+      printf ("listen: %s\n", opt.listen_spec ? opt.listen_spec : "");
+      printf ("protocol: %s\n", opt.protocol_file ? opt.protocol_file : "");
+    }
+
+  if (! (opt.server_spec && opt.listen_spec))
+    print_help (EXIT_FAILURE);
+
+  err = run_proxy ();
+  if (err)
+    {
+      fprintf (stderr, "run_proxy() failed: %s\n", strerror (err));
+      ret = EXIT_FAILURE;
+    }
+  else
+    /* ? */
+    ret = EXIT_SUCCESS;
+
+  return ret;
+}
+
+
+/*
+Local Variables:
+compile-command: "cc -Wall -g -o sockprox sockprox.c -lpthread"
+End:
+*/
author	Werner Koch <[email protected]>	2007-05-09 11:01:33 +0000
committer	Werner Koch <[email protected]>	2007-05-09 11:01:33 +0000
commit	edb3dc99e9833136a7454561d8e0845aa9e55609 (patch)
tree	112160d61c00df7b476409a698f746b07076e20c
parent	Add a howto section. (diff)
download	gnupg-edb3dc99e9833136a7454561d8e0845aa9e55609.tar.gz gnupg-edb3dc99e9833136a7454561d8e0845aa9e55609.zip